Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -97,11 +97,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
     }
 
     public void finalDispose(){
-        if (CollectionUtils.isEmpty(needDisposeList)){
-            return;
-        }
+        if (!CollectionUtils.isEmpty(needDisposeList)){
             List<ImportGeneralDTO> importInfo = neighborHoodService.getImportInfo(formDTO, needDisposeList);
             needInsertList.addAll(importInfo);
+        }
+        if (CollectionUtils.isEmpty(needInsertList)){
+            return;
+        }
         Map<String, Long> collect = needInsertList.stream().collect(Collectors.groupingBy(n -> n.getBuildingUnitId() + "_" + n.getDoorName(), Collectors.counting()));
         collect.forEach((k,v) -> {
             if (Integer.valueOf(v.toString()).compareTo(1) > 0){

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -9,7 +9,7 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx1024m -jar ./epmet-user.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-user.jar"
     restart: "unless-stopped"
     deploy:
       resources: