Merge remote-tracking branch 'origin/master'

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;
@@ -504,8 +507,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);
@@ -562,6 +572,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         }
     }
 
+    private AgencyInfoCache getAgencyInfo(String gridId) {
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId);
+        return CustomerOrgRedis.getAgencyInfo(gridInfo.getPid());
+    }
+
     /**
      * 执行指定的检查以及数据的补充
      * @param columnAndValues