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 932baf369b..2486b306f0 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 @@ -453,6 +453,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res String currUserAgencyPids, String currentUserId, String tableName) { String loginUserCustomerId = EpmetRequestHolder.getLoginUserCustomerId(); // 遍历每一行,将行内容转化为 + String idCard = null; for (Map row : dataRows) { LinkedHashMap columnAndValues = new LinkedHashMap<>(); @@ -463,7 +464,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res execSpecifiedCheckAndFill(columnAndValues); //默认新增 columnAndValues.put("SUB_STATUS", IcResiUserSubStatusEnum.IMPORT.getSubStatus()); - String idCard = columnAndValues.get("ID_CARD"); + idCard = columnAndValues.get("ID_CARD"); Map existingResiMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, idCard, null); if (existingResiMap == null) { @@ -580,7 +581,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res errorMsg = e.getMessage(); } else { errorMsg = "未知系统错误"; - log.error(ExceptionUtils.getErrorStackTrace(e)); + log.error("【居民信息导入】导入身份证为{}的居民基础信息出现未知错误:{}", idCard == null ? "" : idCard, ExceptionUtils.getErrorStackTrace(e)); } ErrorRow errorRow = new ErrorRow(); @@ -696,12 +697,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res // 遍历每一行,将行内容转化为 for (Map row : dataRows) { - + String idCard = null; try { convertColumnWrappers2Map4Persist(headerColumnWrapper, row, currUserAgencyId, checkBoxOptionColumnIdxAndLabel, columnAndValues, false); // 检验身份证号 - String idCard = columnAndValues.get("ID_CARD"); + idCard = columnAndValues.get("ID_CARD"); if (StringUtils.isBlank(idCard)) { String resiName = columnAndValues.get("NAME"); if (resiName == null) { @@ -755,7 +756,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res errorMsg = e.getMessage(); } else { errorMsg = "未知系统错误"; - log.error(ExceptionUtils.getErrorStackTrace(e)); + log.error("【居民信息导入】导入身份证为{}的居民扩展信息{}出现未知错误:{}", idCard == null ? "" : idCard, targetTableName, ExceptionUtils.getErrorStackTrace(e)); } ErrorRow errorRow = new ErrorRow(); @@ -1375,8 +1376,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res cascadeItemColumnWrapper = columnWrappers.get(cascadeItemId); } - log.info("【居民信息导入】#listRemoteOptions,columnWrappers:{},cascadeItemId:{}", JSON.toJSONString(columnWrappers), cascadeItemId); - List options = null; String optionTypeName = null; switch (pureUri) {