From 6f243c373eb36ff70e2c2bd049a5e0f1ca53ce2e Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Thu, 3 Nov 2022 13:36:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=B7=E7=B1=8D=E5=9C=B0=E5=8F=AA=E8=A6=81?=
 =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/IcTripReportFormDTO.java   | 1 -
 .../epmet/service/impl/IcTripReportRecordServiceImpl.java   | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java
index 7476636916..6be4201a24 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java
+++ b/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;
     /**
      * 年龄【磐石】
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
index cee2d141ab..87d6efeb14 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java
+++ b/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小时核算记录为必填");
             }