Merge branches 'develop' and 'dev_epidemic_situation' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcNatExcelImportListener.java

@@ -66,10 +66,18 @@ public class IcNatExcelImportListener implements ReadListener<IcNatImportExcelDa
             // 先校验数据
             ValidatorUtils.validateEntity(data);
 
-            data.setName(data.getName().trim());
+            if (StringUtils.isNotBlank(data.getName())) {
-            data.setMobile(data.getMobile().trim());
+                data.setName(data.getName().trim());
-            data.setNatAddress(data.getNatAddress().trim());
+            }
-            data.setIdCard(data.getIdCard().trim());
+            if (StringUtils.isNotBlank(data.getMobile())) {
+                data.setMobile(data.getMobile().trim());
+            }
+            if (StringUtils.isNotBlank(data.getNatAddress())) {
+                data.setNatAddress(data.getNatAddress().trim());
+            }
+            if (StringUtils.isNotBlank(data.getIdCard())) {
+                data.setIdCard(data.getIdCard().trim());
+            }
 
             // 默认空，没有结果
             String natResult = "";

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

@@ -511,13 +511,13 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
 
             // 检测地点和手机号先不提示，说需要提示再提示
             if (!natAddress.equals(resiNat.getNatAddress())) {
-                changedFieldNames.add("检测地点");
+                //changedFieldNames.add("检测地点");
                 resiNat.setNatAddress(natAddress);
                 needUpdate = true;
             }
 
             if (!mobile.equals(resiNat.getMobile())) {
-                changedFieldNames.add("手机号");
+                //changedFieldNames.add("手机号");
                 resiNat.setMobile(mobile);
                 needUpdate = true;
             }