From 3bcac99c625261ae1d6d0244a6eb5b06fe968d3e Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 8 Apr 2022 15:12:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E5=BC=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/redis/common/CustomerStaffRedis.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java
index 509b12339f..37904be02b 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerStaffRedis.java
@@ -65,6 +65,10 @@ public class CustomerStaffRedis {
      * @remark 此方法仅用于 获取某个工作人员的信息，不用于获取客户下所有工作人员信息
      */
     public static CustomerStaffInfoCacheResult getStaffInfo(String customerId, String staffId) {
+        if (StringUtils.isBlank(customerId) || StringUtils.isBlank(staffId)){
+            log.warn("getStaffInfo param is blank,customerId:{},staffId:{}",customerId,staffId);
+            return null;
+        }
         String key = RedisKeys.getCustomerStaffInfoKey(customerId, staffId);
         Map<String, Object> roleMap = customerStaffRedis.redisUtils.hGetAll(key);
         if (!CollectionUtils.isEmpty(roleMap)) {

From 161277c2ce5818edd35db74cad230c9452568a9d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 8 Apr 2022 15:17:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=86=8D=E4=BF=AE=E6=94=B9=E6=88=BF?=
 =?UTF-8?q?=E5=B1=8B=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/model/ImportHouseInfoListener.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
index 9596a59d1d..f865c43b83 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
@@ -163,7 +163,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         if (StringUtils.isNotBlank(dto.getHouseType()) ){
             if( !"楼房".equals(dto.getHouseType()) && !dto.getHouseType().equals("平房") && !dto.getHouseType().equals("别墅") ){
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info,"房屋类型的值未填写或者所填写信息在系统中未找到");
                 return;
             }
         }
@@ -177,13 +177,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                 !dto.getPurpose().equals("商住混用") &&
                 !dto.getPurpose().equals("其他")) ){
             nums.add(num);
-            disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+            disposeErrorMsg(info, "房屋用途的值未填写或者所填写信息在系统中未找到");
             return;
         }
         dto.setPurpose(HousePurposeEnums.getKeyByValue(dto.getPurpose()));
         if (StringUtils.isNotBlank(dto.getRentFlagString()) && (!dto.getRentFlagString().equals("是") && !dto.getRentFlagString().equals("否"))){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+            disposeErrorMsg(info,"是否出租的值未填写或者所填写信息在系统中未找到");
             return;
         }
         dto.setRentFlag(HouseRentFlagEnums.getCodeByName(dto.getRentFlagString()));
@@ -226,10 +226,12 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                 for (ImportGeneralDTO r : needInsertList) {
                     if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
                         // 集合里重复的
-                        /*nums.add(r.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);*/
                         if (!r.getAddStatus()){
+                            nums.add(r.getNum());
+                            disposeErrorMsg(info,"文件中存在重复数据");
+                            r.setExistStatus(true);
+                        }
+                        /*if (!r.getAddStatus()){
                             for (ExistHouseInfoResultDTO existHouse : existHouses) {
                                 if (existHouse.getName().equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
                                     r.setHouseId(existHouse.getHouseId());
@@ -239,7 +241,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                             needUpdateList.add(r);
                             r.setAddStatus(true);
                             r.setExistStatus(true);
-                        }
+                        }*/
                     }
                 }
             }