From c80135e5c3f7bfab96ba558a910a06f1e587c53c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:14:04 +0800
Subject: [PATCH] 1.新增@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") 2.将新增orgid的拦截器关掉 3.登陆新增campusid
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 0549669..6e5ac2d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -3,8 +3,11 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUserRole;
+import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -53,10 +56,15 @@
@Autowired
private ISysDeptService deptService;
+ @Value("${isAdmin}")
+ private List<Long> isAdmin;
+
//@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/list")
public TableDataInfo list(SysRole role) {
startPage();
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ role.setOrgid(user.getOrgid());
List<SysRole> list = roleService.selectRoleList(role);
return getDataTable(list);
}
@@ -85,7 +93,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:role:add')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping("/add")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysRole role) {
role.setOrgid(getLoginUser().getUser().getOrgid());
if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
@@ -103,7 +112,8 @@
*/
//@PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
- @PostMapping("/edit")
+@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysRole role) {
role.setOrgid(getLoginUser().getUser().getOrgid());
roleService.checkRoleAllowed(role);
@@ -118,7 +128,7 @@
if (roleService.updateRole(role) > 0) {
// 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺
LoginUser loginUser = getLoginUser();
- if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
+ if (StringUtils.isNotNull(loginUser.getUser()) && !isAdmin.contains(loginUser.getUser().getUserId())) {
loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
tokenService.setLoginUser(loginUser);
--
Gitblit v1.9.3