修改bug

2023-04-24 20:12:51 +08:00
parent c55167a6cf
commit 54ac0073f8
2 changed files with 14 additions and 1 deletions
@@ -1401,7 +1401,19 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//查当前用户Viewer对应责任领域
 			List<String> dutyTerritoryList = projectUserDutyTerritoryService.queryDutyTerritoryByUserId(currentUser.getId());
 			if (ObjectUtils.isNotEmpty(dutyTerritoryList)) {
-				result = result.stream().filter(e -> dutyTerritoryList.contains(e.getDutyTerritory())).collect(Collectors.toList());
+//				result = result.stream().filter(e -> dutyTerritoryList.contains(e.getDutyTerritory())).collect(Collectors.toList());
+				result = result.stream().filter(data -> {
+					boolean flag = false;
+					if(StringUtils.isNotEmpty(data.getDutyTerritory())){
+						for (String dutyTerritory : dutyTerritoryList) {
+							if(StringUtils.contains(data.getDutyTerritory(),dutyTerritory)){
+								flag = true;
+								break;
+							}
+						}
+					}
+					return flag;
+				}).collect(Collectors.toList());
 			} else {
 				result = new ArrayList<>();
 			}