修改公告通知bug

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

@@ -490,16 +490,25 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
             taskList.add(task);
         }
         //判断作息（无周期排开）
-        boolean flag = checkWorkTime(dateRange.getStartTime(), dateRange.getEndTime(), sysOrg.getId());
-        if(flag){
+        if(!plan.getPlanCycle().equals(RetrievalTaskCycle.NOCYCLE.getCode())){
+            boolean flag = checkWorkTime(dateRange.getStartTime(), dateRange.getEndTime(), sysOrg.getId());
+            if(flag){
+                for (int i = 1; i <= plan.getPlanFrequency(); i++) {
+                    DateRange dateRange1 = dateRanges.get(i);
+                    CoreMonitoringRetrievalTask task = this.buildCoreMonitoringRetrievalTask(batchNum, i, plan, sysOrg, dateRange1, ymd);
+                    taskList.add(task);
+                }
+            }else{
+                log.error("机构"+sysOrg.getName()+"在时间"+dateRange.getStartTime()+"-"+dateRange.getEndTime()+"没有作息，不生成监控调阅任务");
+            }
+        }else{
             for (int i = 1; i <= plan.getPlanFrequency(); i++) {
                 DateRange dateRange1 = dateRanges.get(i);
                 CoreMonitoringRetrievalTask task = this.buildCoreMonitoringRetrievalTask(batchNum, i, plan, sysOrg, dateRange1, ymd);
                 taskList.add(task);
             }
-        }else{
-            log.error("机构"+sysOrg.getName()+"在时间"+dateRange.getStartTime()+"-"+dateRange.getEndTime()+"没有作息，不生成监控调阅任务");
         }
+
         return taskList;
 
     }