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

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

@@ -26,7 +26,7 @@ public class IcNatExcelImportListener implements ReadListener<IcNatImportExcelDa
     /**
      * 最大条数阈值
      */
-    public static final int MAX_THRESHOLD = 2;
+    public static final int MAX_THRESHOLD = 200;
 
     private String currentUserId;
     /**

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

@@ -509,15 +509,20 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
                 needUpdate = true;
             }
 
-            // 检测地点和手机号先不提示，说需要提示再提示
+            // 检测地点和手机号先不提示，说需要提示再提示。需要考虑两个都不为空&&不相等 || 两个中一个为空一个不为空
+            if ((natAddress == null && resiNat.getNatAddress() != null)
+                    || (natAddress != null && resiNat.getNatAddress() == null)
+                    || (natAddress != null && resiNat.getNatAddress() != null && !natAddress.equals(resiNat.getNatAddress()))) {
+                resiNat.setNatAddress(natAddress);
+                needUpdate = true;
+            }
+
             if (!natAddress.equals(resiNat.getNatAddress())) {
-                //changedFieldNames.add("检测地点");
                 resiNat.setNatAddress(natAddress);
                 needUpdate = true;
             }
 
             if (!mobile.equals(resiNat.getMobile())) {
-                //changedFieldNames.add("手机号");
                 resiNat.setMobile(mobile);
                 needUpdate = true;
             }