处理监控调阅定时更改过期任务的问题

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

@@ -524,7 +524,7 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
         List<CoreMonitoringRetrievalTask> baoliuTaskList = new ArrayList<>();
         List<KeyValueVo> keyValues = new ArrayList<>();
         for (Map<String, Object> objMap : ObjMaps) {
-           /* if (objMap != null && objMap.containsKey("deleteTaskList") && objMap.containsKey("keyValues")) {*/
+            if (objMap != null && objMap.containsKey("deleteTaskList") && objMap.containsKey("keyValues")) {
                 List<CoreMonitoringRetrievalTask> listTask = (List<CoreMonitoringRetrievalTask>) objMap.get("deleteTaskList");
                 List<CoreMonitoringRetrievalTask> listTaska = (List<CoreMonitoringRetrievalTask>) objMap.get("baoliuTaskList");
                 List<KeyValueVo> keyValueList = (List<KeyValueVo>) objMap.get("keyValues");
@@ -537,7 +537,7 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
                 if (CollectionUtil.isNotEmpty(keyValueList)) {
                     keyValues.addAll(keyValueList);
                 }
-            //}
+            }
 
         }
         deleteTaskListMap.put("deleteTaskList", deleteTaskList);
@@ -571,12 +571,12 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
 
         for (TMonitoringRetrievalPlan p : plans) {
             for (SysOrg s : orgs) {
-                if (CollectionUtil.isNotEmpty(keyValues)) {
+               /* if (CollectionUtil.isNotEmpty(keyValues)) {
                     //机构和计划没有同时在排除的范围内的计划不生成任务
                     if (keyValues.stream().filter(r -> r.getValue().equals(p.getId()) && r.getKey().equals(s.getId())).count() > 0) {
                         continue;
                     }
-                }
+                }*/
                 Optional<SysOrg> hsOrg = hsOrgs.stream().filter(hs -> s.getPath().startsWith(hs.getPath())).findFirst();
                 if (!hsOrg.isPresent()) {
                     continue;