修改

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/basic/basicInfo/BasicInfoCustomerPageRequestDTO.java

@@ -20,7 +20,7 @@ public class BasicInfoCustomerPageRequestDTO extends AbstractStaffBizPageRequest
     private String customerName;
     //用户证件类型
     @ApiModelProperty(value = "用户证件类型")
-    @Enumerated(EnumType.STRING)
+//    @Enumerated(EnumType.STRING)
     private String customerIdType;
     //用户证件号码
     @ApiModelProperty(value = "用户证件号码")

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/basic/BasicInfoManagerImpl.java

@@ -43,7 +43,9 @@ public class BasicInfoManagerImpl extends AbstractCommManager implements BasicIn
     public Pagination queryCustomer(BasicInfoCustomerPageRequestDTO req) {
         QtkCustomerInfoPageRequest request = new QtkCustomerInfoPageRequest();
         BeanUtils.copyProperties(req, request);
-        request.setCustomerIdType(IdType.findByCode(Integer.valueOf(req.getCustomerIdType())));
+        if(hasText(req.getCustomerIdType())) {
+            request.setCustomerIdType(IdType.findByCode(Integer.valueOf(req.getCustomerIdType())));
+        }
         return customerInfoRepo.page(request).convertResult(this::coverCustomer);
     }
 
@@ -125,8 +127,12 @@ public class BasicInfoManagerImpl extends AbstractCommManager implements BasicIn
     private BasicInfoCustomerModel coverCustomer(QtkCustomerInfo qtkCustomerInfo) {
         BasicInfoCustomerModel model = new BasicInfoCustomerModel();
         BeanUtils.copyProperties(qtkCustomerInfo, model);
-        model.setCustomerIdType(qtkCustomerInfo.getCustomerIdType().getValue());
-        model.setAgentIdtype(qtkCustomerInfo.getAgentIdType().getValue());
+        if(qtkCustomerInfo.getCustomerIdType() != null) {
+            model.setCustomerIdType(qtkCustomerInfo.getCustomerIdType().getValue());
+        }
+        if(qtkCustomerInfo.getAgentIdType() != null) {
+            model.setAgentIdtype(qtkCustomerInfo.getAgentIdType().getValue());
+        }
         return model;
     }
 
@@ -161,7 +167,9 @@ public class BasicInfoManagerImpl extends AbstractCommManager implements BasicIn
     private BasicInfoVehicleModel coverVeh(QtkVehicleInfo qtkVehicleInfo) {
         BasicInfoVehicleModel model = new BasicInfoVehicleModel();
         BeanUtils.copyProperties(qtkVehicleInfo, model);
-        model.setOwnerIdType(qtkVehicleInfo.getOwnerIdType().getValue());
+        if(qtkVehicleInfo.getUseUserType() != null) {
+            model.setOwnerIdType(qtkVehicleInfo.getOwnerIdType().getValue());
+        }
         //图片地址转换
         extracted(model);
         return model;