|
|
|
@ -360,7 +360,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i |
|
|
|
|
for (SysDeptEntity entity : deptEntities){ |
|
|
|
|
List<UserModel> models = this.getUserAuthList(String.valueOf(entity.getDeptId())); |
|
|
|
|
for(UserModel model : models) { |
|
|
|
|
if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDId()))) { |
|
|
|
|
if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDeptId()))) { |
|
|
|
|
userModels.add(model); |
|
|
|
|
|
|
|
|
|
// if(!model.getDeptId().equals(model.getDId())){
|
|
|
|
|