Merge branch 'V0.0.3' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.3

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -261,10 +261,10 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         }
         //立即生效的计划要排除截至时间在当前时间之前的数据
         List<CoreMonitoringRetrievalTask> lista = taskList.stream().filter(r -> r.getPlanEndTime().after(new Date())).collect(Collectors.toList());
-        if (CollectionUtil.isNotEmpty(lista)) {
-            this.saveBatch(lista);
-        }
 /*        if (CollectionUtil.isNotEmpty(lista)) {
+            this.saveBatch(lista);
+        }*/
+        if (CollectionUtil.isNotEmpty(lista)) {
             List<CoreMonitoringRetrievalTask> listAll = new ArrayList<>();
             //对list进行重新编号和保存
             //对lista 按机构进行分组
@@ -285,7 +285,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
             }
 
             this.saveBatch(listAll);
-        }*/
+        }
     }
 
     /**