租客身份证重复判断

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);

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());
+        params.put("idCard", dto.getIdCard());
-        if(!list(params).isEmpty()){
+        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);