From 43402549602fc4211f33119176be7740cc640420 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 22 May 2023 13:43:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E3=80=90=E7=81=B5=E5=B1=B1-=E7=BA=A2?=
 =?UTF-8?q?=E8=89=B2=E4=BB=A3=E5=8A=9E=E3=80=91=E5=AF=BC=E5=85=A5+?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9AorgIdPath=E8=AE=A1=E7=AE=97=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tractLingShanSpecialCrowdExcelImportListener.java | 12 ++++++++++--
 .../impl/LingShanSpecialCrowdServiceImpl.java        | 12 +++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java
index 23dd2802ad..6361f0da7d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/AbstractLingShanSpecialCrowdExcelImportListener.java
@@ -9,7 +9,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ValidateException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.PidUtils;
@@ -244,7 +246,7 @@ public abstract class AbstractLingShanSpecialCrowdExcelImportListener<T extends
      * @date: 2023/4/18 3:42 PM
      */
     protected void saveBatch() {
-        String orgIdPath = PidUtils.convertPid2OrgIdPath(currentStaffInfo.getAgencyId(), currentStaffInfo.getAgencyPIds());
+        // String orgIdPath = PidUtils.convertPid2OrgIdPath(currentStaffInfo.getAgencyId(), currentStaffInfo.getAgencyPIds());
         String customerId = EpmetRequestHolder.getLoginUserCustomerId();
         Date now = new Date();
         Iterator<T> it = getOriginDatas().iterator();
@@ -256,9 +258,15 @@ public abstract class AbstractLingShanSpecialCrowdExcelImportListener<T extends
                 errorDatas.add(row);
                 it.remove();
             } else {
+                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(row.getResiGridId());
+
+                if (gridInfo == null) {
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "【灵山街道-特殊人群】导入：未找到网格: " + row.getResiGridId());
+                }
+
                 specialTypes.add(new PersonSpecialTypeBean(row.getResiId(), row.getIdCard(), specialCrowdType.getType()));
 
-                orgIdPath = PidUtils.convertPid2OrgIdPath(row.getResiGridId(), orgIdPath);
+                String orgIdPath = PidUtils.convertPid2OrgIdPath(row.getResiGridId(), gridInfo.getPids());
 
                 E e = ConvertUtils.sourceToTarget(row, entityClass);
                 e.setCustomerId(customerId);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java
index a4d83cef6e..44ad25ff4d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java
@@ -433,10 +433,16 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
 
         String customerId = EpmetRequestHolder.getLoginUserCustomerId();
         String staffId = EpmetRequestHolder.getLoginUserId();
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId);
-        String orgIdPath = PidUtils.convertPid2OrgIdPath(staffInfo.getAgencyId(), staffInfo.getAgencyPIds());
+        // CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+        // String orgIdPath = PidUtils.convertPid2OrgIdPath(staffInfo.getAgencyId(), staffInfo.getAgencyPIds());
 
-        orgIdPath = PidUtils.convertPid2OrgIdPath(vt.getResiGridId(), orgIdPath);
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(vt.getResiGridId());
+
+        if (gridInfo == null) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), null, "【灵山街道-特殊人群】新增：未找到网格: " + vt.getResiGridId());
+        }
+
+        String orgIdPath = PidUtils.convertPid2OrgIdPath(vt.getResiGridId(), gridInfo.getPids());
 
         Date now = new Date();