|
|
@@ -348,13 +348,6 @@ public class CoreMonitoringRetrievalTaskBuilderServiceImpl extends ServiceImpl<C
|
|
|
sysOrg.setPath(p.getOrgPath());
|
|
|
sysOrg.setType(Integer.valueOf(p.getOrgType()));
|
|
|
List<SysOrg> sysOrgs = remoteOrgService.listByParentIdAndType(sysOrg, SecurityConstants.INNER);*/
|
|
|
- /* for (int i = orgList.size() - 1; i >= 0; i--) {
|
|
|
- if (null == orgList.get(i).getType()) {
|
|
|
- orgList.remove(i);
|
|
|
- } else if (null == orgList.get(i).getPath()) {
|
|
|
- orgList.remove(i);
|
|
|
- }
|
|
|
- }*/
|
|
|
List<SysOrg> sysOrgs = orgList.stream().
|
|
|
filter(s -> (s.getPath()!=null&&s.getPath().contains(p.getOrgPath()) )&& (s.getType() != null && s.getType().toString().equals(p.getOrgType())))
|
|
|
.collect(Collectors.toList());
|