|
|
|
|
@ -152,7 +152,9 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> 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)); |
|
|
|
|
|