|
|
|
@ -360,17 +360,17 @@ 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.getDeptId()))) { |
|
|
|
|
if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDId()))) { |
|
|
|
|
userModels.add(model); |
|
|
|
|
|
|
|
|
|
if(!model.getDeptId().equals(model.getDId())){ |
|
|
|
|
UserModel userModel = new UserModel(); |
|
|
|
|
userModel.setUserId(model.getUserId()); |
|
|
|
|
userModel.setLoginname(model.getLoginname()); |
|
|
|
|
userModel.setUsername(model.getUsername()); |
|
|
|
|
userModel.setDeptId(model.getDId()); |
|
|
|
|
userModels.add(userModel); |
|
|
|
|
} |
|
|
|
|
// if(!model.getDeptId().equals(model.getDId())){
|
|
|
|
|
// UserModel userModel = new UserModel();
|
|
|
|
|
// userModel.setUserId(model.getUserId());
|
|
|
|
|
// userModel.setLoginname(model.getLoginname());
|
|
|
|
|
// userModel.setUsername(model.getUsername());
|
|
|
|
|
// userModel.setDeptId(model.getDId());
|
|
|
|
|
// userModels.add(userModel);
|
|
|
|
|
// }
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|