From be90c5ad7af7528872dd0eaeae6c419a5ceedbc3 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 11 三月 2025 16:27:25 +0800
Subject: [PATCH] 角色权限修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 16 ++++++++++++++++
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 2 ++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index c16a962..6501862 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -6,11 +6,13 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
@@ -39,6 +41,8 @@
@Autowired
private ISysRoleService roleService;
+ @Autowired
+ private SysRoleMapper roleMapper;
@Autowired
private ISysDeptService deptService;
@@ -103,6 +107,18 @@
return ajax;
}
+ @PreAuthorize("@ss.hasPermi('system:user:query')")
+ @GetMapping("/role")
+ public AjaxResult role(){
+ AjaxResult success = AjaxResult.success();
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ userService.checkUserDataScope(loginUser.getUserId());
+ List<SysRole> sysRoles = roleMapper.selectRoleAll();
+ success.put("roles",SysUser.isAdmin(loginUser.getUserId()) ? sysRoles : sysRoles.stream().filter(r->r.getRoleKey().equals("feimeiexam") || r.getRoleKey().equals("supervise")).collect(Collectors.toList()));
+ success.put("posts",postService.selectPostAll());
+ return success;
+ }
+
/**
* 新增用户
*/
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 52306c2..94f1401 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -63,6 +63,8 @@
<select id="selectRoleAll" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
+ WHERE r.del_flag = '0'
+ order by r.role_sort
</select>
<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
--
Gitblit v1.9.2