fix: 修复更新在线用户权限信息报错的问题

continew-org · Sep 26, 2024 · 8278032 · 8278032
1 parent 5cbeddb
commit 8278032
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java b/...ew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java
@@ -103,11 +103,11 @@ public void update(RoleReq req, Long id) {
         // 保存角色和部门关联
         boolean isSaveDeptSuccess = roleDeptService.add(req.getDeptIds(), id);
         // 如果功能权限或数据权限有变更，则更新在线用户权限信息
-        if (ObjectUtil.notEqual(req.getDataScope(), oldDataScope) || isSaveMenuSuccess || isSaveDeptSuccess) {
+        if (isSaveMenuSuccess || isSaveDeptSuccess || ObjectUtil.notEqual(req.getDataScope(), oldDataScope)) {
             OnlineUserQuery query = new OnlineUserQuery();
             query.setRoleId(id);
             List<LoginUser> loginUserList = onlineUserService.list(query);
-            loginUserList.parallelStream().forEach(loginUser -> {
+            loginUserList.forEach(loginUser -> {
                 loginUser.setRoles(this.listByUserId(loginUser.getId()));
                 loginUser.setPermissions(this.listPermissionByUserId(loginUser.getId()));
                 LoginHelper.updateLoginUser(loginUser, loginUser.getToken());

diff --git a/...ew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/...ew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
@@ -336,7 +336,7 @@ public void update(UserReq req, Long id) {
             OnlineUserQuery query = new OnlineUserQuery();
             query.setUserId(id);
             List<LoginUser> loginUserList = onlineUserService.list(query);
-            loginUserList.parallelStream().forEach(loginUser -> {
+            loginUserList.forEach(loginUser -> {
                 loginUser.setRoles(roleService.listByUserId(loginUser.getId()));
                 loginUser.setPermissions(roleService.listPermissionByUserId(loginUser.getId()));
                 LoginHelper.updateLoginUser(loginUser, loginUser.getToken());