From fefd327935a3585aae67c0c5118df60b01e958a1 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 3 Jan 2023 15:16:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=A0=A1=E9=AA=8C=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=E5=8F=B7=E9=80=BB=E8=BE=91=E6=8F=90=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RentContractInfoServiceImpl.java     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 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 efea309..ee495da 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
@@ -282,6 +282,19 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         if (NumConstant.ONE_STR.equals(entity.getState())) {
             // 获取基本信息
             RentContractInfoDTO contractDto = get(dto.getId());
+            // 获取租客信息
+            Map<String, Object> tenantParams = new HashMap<>(4);
+            tenantParams.put("contractId", contractDto.getId());
+            List<RentTenantInfoDTO> tenantList = rentTenantInfoService.list(tenantParams);
+            // 提前校验身份证格式
+            for(RentTenantInfoDTO rentTenantInfoDTO : tenantList){
+                // 校验身份证
+                IdCardRegexUtils regex = IdCardRegexUtils.parse(rentTenantInfoDTO.getIdCard());
+                if (regex == null) {
+                    return new Result().error(rentTenantInfoDTO.getName()+"证件号错误");
+//                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), rentTenantInfoDTO.getName()+"证件号错误", rentTenantInfoDTO.getName()+"证件号错误");
+                }
+            }
 
             // 1、审核通过，插入合同记录表
             PliRentContractInfoLogEntity logEntity = ConvertUtils.sourceToTarget(contractDto, PliRentContractInfoLogEntity.class);
@@ -297,17 +310,9 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             }
             rentContractFileService.insertBatch(contractFileEntities);
 
-            // 获取租客信息
-            Map<String, Object> tenantParams = new HashMap<>(4);
-            tenantParams.put("contractId", contractDto.getId());
-            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()));