From ef5b1bbfa367d10649a3d542170526e27cdb11aa Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 7 Dec 2022 13:57:24 +0800
Subject: [PATCH] log

---
 .../service/impl/RentContractInfoServiceImpl.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
index 86a14d7..efea309 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
@@ -303,6 +303,12 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             List<RentTenantInfoDTO> tenantList = rentTenantInfoService.list(tenantParams);
 
             tenantList.forEach(tenant -> {
+                // 校验身份证
+                IdCardRegexUtils regex = IdCardRegexUtils.parse(tenant.getIdCard());
+                if (regex == null) {
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), tenant.getName()+"证件号错误", tenant.getName()+"证件号错误");
+                }
+
                 // 根据身份证解析性别和出生日期
                 tenant.setGender("0".equals(IdCardNoValidatorUtils.getGender(tenant.getIdCard())) ? "" : IdCardNoValidatorUtils.getGender(tenant.getIdCard()));
                 if(tenant.getIdCard() != null && tenant.getIdCard().length() == 18){
@@ -317,11 +323,6 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                 rentTenantInfoEntity.setContractId(logEntity.getId());
                 rentTenantInfoService.insert(rentTenantInfoEntity);
 
-                IdCardRegexUtils regex = IdCardRegexUtils.parse(tenant.getIdCard());
-                if (regex == null) {
-                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), tenant.getName()+"证件号错误", tenant.getName()+"证件号错误");
-                }
-
                 RentTenantFormDTO formDTO = new RentTenantFormDTO();
                 List<IcResiUserAttachmentDTO> images = new ArrayList<>();
                 formDTO.setCustomerId(loginUserUtil.getLoginUserCustomerId());