Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

@@ -539,10 +539,18 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private void specifiedCheck(LinkedHashMap<String, String> columnAndValues) {
         String idCard = columnAndValues.get("ID_CARD");
         String mobile = columnAndValues.get("MOBILE");
+        String name = columnAndValues.get("NAME");
 
         List<String> errors = new ArrayList<>();
 
-        if (StringUtils.isNotBlank(idCard) && idCard.length() > 18) {
+        if (StringUtils.isBlank(idCard)) {
+            log.debug("【居民信息导入】specifiedCheck身份证号为空的：{},{}", mobile, name);
+
+            String errorMsg = "身份证号不能为空";
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+        }
+
+        if (idCard.length() > 18) {
             // 身份证号超长了哦，不可以的
             errors.add("身份证号过长");
         }
@@ -573,9 +581,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
         LinkedHashMap<String, String> columnAndValues = new LinkedHashMap<>();
 
-        String loginUserApp =  EpmetRequestHolder.getHeader(AppClientConstant.APP);
-        String loginUserClient = EpmetRequestHolder.getHeader(AppClientConstant.CLIENT);
-        String loginUserId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID.toLowerCase());
         String loginUserCustomerId = EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID.toLowerCase());
 
         // 遍历每一行，将行内容转化为