修改了客户管理的bug

hx-customer/src/main/java/com/fjhx/customer/entity/customer/dto/CustomerDto.java

@@ -17,6 +17,6 @@ import java.util.List;
 @Getter
 @Setter
 public class CustomerDto extends Customer {
-    @TableField(exist = false)
+
     private List<CustomerUser> customerUserList;
 }

hx-customer/src/main/java/com/fjhx/customer/entity/customer/dto/CustomerSelectDto.java

@@ -28,5 +28,10 @@ public class CustomerSelectDto extends BaseSelectDto {
      */
     private String type;
 
+    /**
+     *查询名称（模糊查询时使用）
+     */
+    private String keyword;
+
 
 }

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerServiceImpl.java

@@ -59,9 +59,13 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
             if (dto.getType().equals("1")){
                 wrapper.isNotNull(Customer::getUserId);
             }else if (dto.getType().equals("0")){
-                wrapper.isNull(Customer::getUserId);
+                wrapper.and(wrapper1 -> wrapper1.isNull(Customer::getUserId).or().eq(Customer::getUserId,""));
             }
         }
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())){
+            //查询客户名称或者客户编码
+            wrapper.and(wrapper1 -> wrapper1.like(Customer::getName,dto.getKeyword()).or().eq(Customer::getCode,dto.getKeyword()));
+        }
         wrapper.orderByDesc(Customer::getCreateTime);
         Page<CustomerVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
@@ -141,6 +145,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         LambdaQueryWrapper<Customer> wrapper = Wrappers.<Customer>lambdaQuery();
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getSource()),Customer::getSource,dto.getSource());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()),Customer::getStatus,dto.getStatus());
+        if (ObjectUtil.isNotEmpty(dto.getKeyword())){
+            //查询客户名称或者客户编码
+            wrapper.and(wrapper1 -> wrapper1.like(Customer::getName,dto.getKeyword()).or().eq(Customer::getCode,dto.getKeyword()));
+        }
         //添加权限（自己看自己）
         wrapper.eq(Customer::getUserId, SecurityUtils.getUserId());
         wrapper.orderByDesc(Customer::getCreateTime);