diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java index b6c711ba..3f88500e 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java @@ -152,7 +152,9 @@ public class DeptServiceImpl extends ServiceImpl implements ID if(teamUnSelects != null && teamUnSelects.size() > 0){ - noChooseMap = teamUnSelects.stream().collect(Collectors.groupingBy(User::getDeptId)); + noChooseMap = teamUnSelects.stream() + .filter(user -> user.getDeptId() != null) + .collect(Collectors.groupingBy(User::getDeptId)); } if(teamSelects != null && teamSelects.size() > 0){ chooseMap = teamSelects.stream().collect(Collectors.groupingBy(User::getDeptId));