From c7abf913d8e40f69d43d77205a0a1aa5c704613b Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 11 Nov 2022 10:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=BF=E5=AE=A1=E6=A0=B8=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/plugin/power/dto/rent/RentContractInfoDTO.java | 2 +-
 .../epmet/plugin/power/dto/rent/RentTenantInfoDTO.java   | 9 ++++++++-
 .../power/modules/rent/entity/RentTenantInfoEntity.java  | 5 +++++
 .../rent/service/impl/RentContractInfoServiceImpl.java   | 4 ++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java
index 91485f4..2905055 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java
@@ -160,7 +160,7 @@ public class RentContractInfoDTO implements Serializable {
     /**
      * 承租人户籍地地址
      */
-    @NotBlank(message = "承租人户籍地地址不能为空")
+//    @NotBlank(message = "承租人户籍地地址不能为空")
     private String lesseeHouseAddress;
 
     /**
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java
index 700b825..f287e13 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java
@@ -114,4 +114,11 @@ public class RentTenantInfoDTO implements Serializable {
     @NotEmpty
     private List<RentContractFileDTO> idCardImgList;
 
-}
\ No newline at end of file
+    /**
+     * 户籍所在地
+     */
+    @NotBlank(message = "户籍地不能为空")
+    private String hjszd;
+
+
+}
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java
index f235ed5..bf9b963 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java
@@ -101,4 +101,9 @@ public class RentTenantInfoEntity extends BaseEpmetEntity {
 	@TableField(exist = false)
 	private List<RentContractFileDTO> idCardImgList;
 
+	/**
+	 * 户籍所在地
+	 */
+	private String hjszd;
+
 }
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 4e16ba4..781020b 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
@@ -451,7 +451,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             // 处理租客头像和身份证照片
             tenantList.forEach(tenant -> {
                 if (null == tenant.getImgList() || tenant.getImgList().isEmpty()) {
-                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "租客照片不能为空");
+//                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "租客照片不能为空");
                 } else {
                     List<RentContractFileEntity> imgList = ConvertUtils.sourceToTarget(tenant.getImgList(), RentContractFileEntity.class);
                     imgList.forEach(img -> {
@@ -462,7 +462,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                     rentContractFileService.insertBatch(imgList);
                 }
                 if (null == tenant.getIdCardImgList() || tenant.getIdCardImgList().isEmpty()) {
-                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "租客身份证照片不能为空");
+//                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "租客身份证照片不能为空");
                 } else {
                     List<RentContractFileEntity> idCardImgList = ConvertUtils.sourceToTarget(tenant.getIdCardImgList(), RentContractFileEntity.class);
                     idCardImgList.forEach(img -> {