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

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

@@ -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;
@@ -687,15 +687,17 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
                     List<CoreMonitoringRetrievalTask> taskList4 =taskList2.stream().filter(t->t.getStatus().equals("2")).collect(Collectors.toList());
                      if(CollectionUtil.isNotEmpty(taskList3)){
                          deleteTaskList.addAll(taskList3);
+                     }else{
+                         Long planId = taskList2.get(0).getPlanId();
+                         KeyValueVo keyValue = new KeyValueVo();
+                         keyValue.setKey(key);
+                         keyValue.setValue(planId);
+                         keyValues.add(keyValue);
                      }
                     if(CollectionUtil.isNotEmpty(taskList4)){
                         baoliuTaskList.addAll(taskList4);
                     }
-                    Long planId = taskList2.get(0).getPlanId();
-                    KeyValueVo keyValue = new KeyValueVo();
-                    keyValue.setKey(key);
-                    keyValue.setValue(planId);
-                    keyValues.add(keyValue);
+
           /*          int num = (int) taskList2.stream().filter(t -> t.getStatus().equals(2)).count();
                     //没有完成的任务，改批次的任务删除
                     if (num == 0) {