修改公告通知bug

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

@@ -453,7 +453,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
             sysOrg.setPath(p.getOrgPath());
             sysOrg.setType(Integer.valueOf(p.getOrgType()));
             List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);*/
-            List<SysOrg> sysOrgs = orgList.stream().filter(s -> s.getPath().contains(p.getOrgPath()) && s.getOrgType().equals(p.getOrgType())).collect(Collectors.toList());
+            List<SysOrg> sysOrgs = orgList.stream().filter(s -> s.getPath().contains(p.getOrgPath()) && (s.getType()!=null&&s.getType().toString().equals(p.getOrgType()))).collect(Collectors.toList());
             for (SysOrg s : sysOrgs) {
                 TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();
                 BeanUtils.copyProperties(p, plan);
@@ -708,7 +708,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
                     }
                 }
                 //计划的机构id不是当前机构的直属父机构，不生成任务,计划的机构类型不是当前机构的机构类型不生成任务
-                if(!p.getOrgId().equals(s.getParentId())||!p.getOrgType().equals(s.getOrgType())){
+                if(!p.getOrgId().equals(s.getParentId())||(s.getType()!=null&&!s.getType().toString().equals(p.getOrgType()))){
                     continue;
                 }
                 TMonitoringRetrievalPlan plan = new TMonitoringRetrievalPlan();