diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java index 4022f3d77..153a0bb0f 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java @@ -106,10 +106,15 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl other_interferencesource_users_dict = sysdictreepo.stream().filter(temp -> other_interferencesource_users.contains(temp.getCode())).collect(Collectors.toList()); +// List other_interferencesource_users_dict = sysdictreepo.stream().filter(temp -> other_interferencesource_users.contains(temp.getCode())).collect(Collectors.toList()); List windfarm_user_dict = sysdictreepo.stream().filter(temp -> windfarm_user.contains(temp.getCode())).collect(Collectors.toList()); List photovoltaicsit_eusers_dict = sysdictreepo.stream().filter(temp -> photovoltaicsit_eusers.contains(temp.getCode())).collect(Collectors.toList()); List tractionstation_dict = sysdictreepo.stream().filter(temp -> tractionstation.contains(temp.getCode())).collect(Collectors.toList()); + List un_other_interferencesource_users_dict = new ArrayList<>(); + un_other_interferencesource_users_dict.addAll(photovoltaicsit_eusers_dict); + un_other_interferencesource_users_dict.addAll(tractionstation_dict); + un_other_interferencesource_users_dict.addAll(tractionstation_dict); + List deptList = deptFeignClient.allDeptList().getData(); @@ -148,8 +153,8 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl idList.contains(tempmonitor.getObjType())).collect(Collectors.toList()); pqTypicalSourceCreatePO.setIndustryType("99"); }else if(temp.equals(DicDataEnum.OTHER_INTERFERENCESOURCE_USERS.getCode())) { - List idList = other_interferencesource_users_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList()); - tempList = monitorList.stream().filter(tempmonitor -> idList.contains(tempmonitor.getObjType())).collect(Collectors.toList()); + List idList = un_other_interferencesource_users_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList()); + tempList = monitorList.stream().filter(tempmonitor -> !idList.contains(tempmonitor.getObjType())).collect(Collectors.toList()); pqTypicalSourceCreatePO.setIndustryType("08"); }