From d05dea157674ed722bc832ddfe754381400b947c Mon Sep 17 00:00:00 2001
From: dx <1242347652@qq.com>
Date: Tue, 25 Feb 2025 14:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=95=B0=E6=8D=AE=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/auth/AdminAuthServiceImpl.java | 62 +++++++------------
1 file changed, 23 insertions(+), 39 deletions(-)
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
index bdfe6c1..97dbbaa 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
@@ -459,47 +459,31 @@ public class AdminAuthServiceImpl implements AdminAuthService {
AdminUserDO user = userService.getUser(loginUserId);
RoleNameAndSelectTypeVO roleNameAndSelectTypeVO = new RoleNameAndSelectTypeVO();
if (user != null) {
- if (user.getPostIds() != null) {
- if (user.getPostIds().contains(1L) || user.getPostIds().contains(2L)) {
- // 全部权限，不需要设置任何条件
- roleNameAndSelectTypeVO.setRoleName("director");
- } else if (user.getPostIds().contains(4L)) {
- // 本部门权限
- roleNameAndSelectTypeVO.setRoleName("queue");
- roleNameAndSelectTypeVO.setValue(user.getDeptId());
- } else {
- // 仅自己权限
- roleNameAndSelectTypeVO.setRoleName("self");
- roleNameAndSelectTypeVO.setValue(loginUserId);
- roleNameAndSelectTypeVO.setDeptId(user.getDeptId());
- }
- } else {
- //如果岗位不存在查询角色
- LambdaQueryWrapper<UserRoleDO> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UserRoleDO::getUserId, loginUserId);
- List<UserRoleDO> userRoleDO = userRoleMapper.selectList(wrapper);
-
- if (userRoleDO == null) {
- throw exception(ROLE_ERROR);
- }
-
- List<Long> collect = userRoleDO.stream().map(item -> item.getRoleId()).collect(Collectors.toList());
- if (collect.contains(164l) || collect.contains(1l)) {
- // 全部权限，不需要设置任何条件
- roleNameAndSelectTypeVO.setRoleName("director");
- } else if (collect.contains(163L)) {
- // 本部门权限
- roleNameAndSelectTypeVO.setRoleName("queue");
- roleNameAndSelectTypeVO.setValue(user.getDeptId());
- } else {
- // 仅自己权限
- roleNameAndSelectTypeVO.setRoleName("self");
- roleNameAndSelectTypeVO.setValue(loginUserId);
- roleNameAndSelectTypeVO.setDeptId(user.getDeptId());
-
- }
+ //如果岗位不存在查询角色
+ LambdaQueryWrapper<UserRoleDO> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(UserRoleDO::getUserId, loginUserId);
+ List<UserRoleDO> userRoleDO = userRoleMapper.selectList(wrapper);
+
+ if (userRoleDO == null) {
+ throw exception(ROLE_ERROR);
+ }
+
+ List<Long> collect = userRoleDO.stream().map(item -> item.getRoleId()).collect(Collectors.toList());
+ if (collect.contains(164l) || collect.contains(1l)) {
+ // 全部权限，不需要设置任何条件
+ roleNameAndSelectTypeVO.setRoleName("director");
+ } else if (collect.contains(163L)) {
+ // 本部门权限
+ roleNameAndSelectTypeVO.setRoleName("queue");
+ roleNameAndSelectTypeVO.setValue(user.getDeptId());
+ } else {
+ // 仅自己权限
+ roleNameAndSelectTypeVO.setRoleName("self");
+ roleNameAndSelectTypeVO.setValue(loginUserId);
+ roleNameAndSelectTypeVO.setDeptId(user.getDeptId());
}
+
} else {
throw exception(USER_NOT_EXISTS);
}