From 6ff124cd4a89582d677680fff3249e0f3537cfde Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Mon, 30 May 2022 17:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E3=80=91AGENCY=5FID=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=8F=96=E6=89=80=E5=B1=9E=E7=BD=91=E6=A0=BC=E7=9A=84=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E4=BB=8E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=99=BB=E5=BD=95=E4=BA=BA=E5=91=98=E7=9A=84agencyId?=
 =?UTF-8?q?=E4=B8=AD=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcResiUserImportServiceImpl.java     | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index d952fddea7..e656febce2 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -23,7 +23,10 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+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.FileUtils;
@@ -502,8 +505,15 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     columnAndValues.put("IS_FLOATING", existingResiMap.get("IS_FLOATING"));
                 }
 
-                columnAndValues.put("AGENCY_ID", currUserAgencyId);
-                columnAndValues.put("PIDS", currUserAgencyPids);
+                String gridId = columnAndValues.get("GRID_ID");
+                AgencyInfoCache agencyInfo = getAgencyInfo(gridId);
+                if (agencyInfo != null) {
+                    columnAndValues.put("AGENCY_ID", agencyInfo.getId());
+                    columnAndValues.put("PIDS", agencyInfo.getPids());
+                } else {
+                    String msg = String.format("【居民信息导入】根据网格查询组织失败，网格ID:%s", gridId);
+                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
+                }
                 columnAndValues.put("CUSTOMER_ID", EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID.toLowerCase()));
 
                 columnAndValues.put("UPDATED_BY", currentUserId);
@@ -560,6 +570,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         }
     }
 
+    private AgencyInfoCache getAgencyInfo(String gridId) {
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId);
+        return CustomerOrgRedis.getAgencyInfo(gridInfo.getPid());
+    }
+
     /**
      * 执行指定的检查以及数据的补充
      * @param columnAndValues