diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java index 965262da..bbf331e5 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java @@ -360,17 +360,17 @@ public class SysUserServiceImpl extends ServiceImpl i for (SysDeptEntity entity : deptEntities){ List 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); +// } } }