ariesy 修改认证人权限

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java

@@ -357,23 +357,23 @@ 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()))) {
+                    if(userModels.stream().noneMatch(e -> model.getUserId().equals(e.getUserId()) && model.getDeptId().equals(e.getDeptId()))) {
                         userModels.add(model);
                     }
                 }
             }
 
-            //增加当前登录用户选中的数据
-            for (SysDeptEntity entity : deptEntities){
-                UserModel userModel = new UserModel();
-                userModel.setUserId(String.valueOf(user.getUserId()));
-                userModel.setUsername(user.getUsername());
-                userModel.setLoginname(user.getLoginname());
-                userModel.setDeptId(String.valueOf(entity.getDeptId()));
-                if(userModels.stream().noneMatch(e -> userModel.getUserId().equals(e.getUserId()) && userModel.getDeptId().equals(e.getDeptId()) )) {
-                    userModels.add(userModel);
-                }
-            }
+//            //增加当前登录用户选中的数据
+//            for (SysDeptEntity entity : deptEntities){
+//                UserModel userModel = new UserModel();
+//                userModel.setUserId(String.valueOf(user.getUserId()));
+//                userModel.setUsername(user.getUsername());
+//                userModel.setLoginname(user.getLoginname());
+//                userModel.setDeptId(String.valueOf(entity.getDeptId()));
+//                if(userModels.stream().noneMatch(e -> userModel.getUserId().equals(e.getUserId()) && userModel.getDeptId().equals(e.getDeptId()) )) {
+//                    userModels.add(userModel);
+//                }
+//            }
 
             log.info("userModels={}",userModels);
             user.setUserModels(userModels);