Merge remote-tracking branch 'origin/master'

This commit is contained in:
wr
2024-02-28 19:59:42 +08:00

View File

@@ -155,7 +155,7 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
}else if(temp.equals(DicDataEnum.OTHER_INTERFERENCESOURCE_USERS.getCode())) { }else if(temp.equals(DicDataEnum.OTHER_INTERFERENCESOURCE_USERS.getCode())) {
List<String> idList = un_other_interferencesource_users_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList()); List<String> 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()); tempList = monitorList.stream().filter(tempmonitor -> !idList.contains(tempmonitor.getObjType())).collect(Collectors.toList());
pqTypicalSourceCreatePO.setIndustryType("08"); pqTypicalSourceCreatePO.setIndustryType("00");
} }