Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -790,8 +790,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                         "身份证号未填写",
                         "身份证号未填写");
             }
-
+            String loginUserCustomerId = EpmetRequestHolder.getLoginUserCustomerId();
-            Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, idCard, null);
+            Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, idCard, null);
 
             if (resiInfoMap == null || resiInfoMap.size() == 0) {
                 throw new RenException(EpmetErrorCode.RESI_NOT_FOUND.getCode(), String.format("身份证号为【%s】的居民信息未找到，请确认该居民信息存在", idCard));
@@ -1848,7 +1848,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         for (Map.Entry<String, ResiImportChangedData> resi : transferedResis.entrySet()) {
 
             String resiId = resi.getKey();
-            Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(customerId, null, resiId);
+            Map<String, String> resiInfoMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, null, resiId);
             String resiName = resiInfoMap.get("NAME");
             String pids = resiInfoMap.get("PIDS");