From 569a0686b65a41dc97b18d8710fb649a4a02cd78 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 28 Apr 2022 09:32:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E5=AE=A2=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/service/impl/RentContractInfoServiceImpl.java      | 6 +++---
 .../rent/service/impl/RentTenantInfoServiceImpl.java        | 6 +++---
 2 files changed, 6 insertions(+), 6 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 2fb3100..bb47a4f 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
@@ -235,7 +235,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         rentTenantInfoService.deletePhysical(params);
         rentContractFileService.deletePhysical(params);
 
-        if (dto.getTenantList().isEmpty()) {
+        if (null == dto.getTenantList() || dto.getTenantList().isEmpty()) {
             return new Result().error("租客不能为空");
         } else {
             List<RentTenantInfoEntity> tenantList = ConvertUtils.sourceToTarget(dto.getTenantList(), RentTenantInfoEntity.class);
@@ -258,7 +258,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             rentTenantInfoService.insertBatch(tenantList);
             // 处理租客头像
             dto.getTenantList().forEach(tenant -> {
-                if (tenant.getImgList().isEmpty()) {
+                if (null == tenant.getImgList() || tenant.getImgList().isEmpty()) {
                     throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "租客照片不能为空");
                 } else {
                     List<RentContractFileEntity> imgList = ConvertUtils.sourceToTarget(tenant.getImgList(), RentContractFileEntity.class);
@@ -272,7 +272,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             });
 
         }
-        if (dto.getFileList().isEmpty()) {
+        if (null == dto.getFileList() || dto.getFileList().isEmpty()) {
             return new Result().error("合同附件不能为空");
         } else {
             List<RentContractFileEntity> fileList = ConvertUtils.sourceToTarget(dto.getFileList(), RentContractFileEntity.class);
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java
index 721f145..80eb329 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java
@@ -88,14 +88,14 @@ public class RentTenantInfoServiceImpl extends BaseServiceImpl<RentTenantInfoDao
     @Transactional(rollbackFor = Exception.class)
     public Result save(RentTenantInfoDTO dto) {
         Map<String, Object> params = new HashMap<>(4);
-        params.put("idCard",dto.getIdCard());
-        if(!list(params).isEmpty()){
+        params.put("idCard", dto.getIdCard());
+        if (!list(params).isEmpty()) {
             return new Result().error("用户已存在");
         }
 
         List<IcResiUserAttachmentDTO> images = new ArrayList<>();
         // 处理头像
-        if (dto.getImgList().isEmpty()) {
+        if (null == dto.getImgList() || dto.getImgList().isEmpty()) {
             return new Result().error("照片不能为空");
         } else {
             RentTenantInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentTenantInfoEntity.class);