户籍地只要磐石必填

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java

@@ -201,7 +201,6 @@ public class IcTripReportFormDTO implements Serializable {
     /**
      * 户籍地 【磐石】
      */
-    @NotBlank(message = "户籍地不能为空", groups = {ResiUserRequired.class})
     private String registeredResidence;
     /**
      * 年龄【磐石】

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@@ -212,6 +212,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }
         //磐石
         if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){
+            if(StringUtils.isEmpty(formDTO.getRegisteredResidence())){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "户籍地为必填", "户籍地为必填");
+            }
             if(StringUtils.isEmpty(formDTO.getNatOutcome())){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "48小时核算记录为必填", "48小时核算记录为必填");
             }
@@ -370,6 +373,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }
         //磐石
         if(StrConstant.PS_CUSTOMER_ID.equals(formDTO.getCustomerId())){
+            if(StringUtils.isEmpty(formDTO.getRegisteredResidence())){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "户籍地为必填", "户籍地为必填");
+            }
             if(StringUtils.isEmpty(formDTO.getNatOutcome())){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "48小时核算记录为必填", "48小时核算记录为必填");
             }