From 129c5b1353a11543ed48791192248dbe114a46b5 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 19 一月 2026 15:22:35 +0800
Subject: [PATCH] 【景宁】角色增加机构限制
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 4a7f264..2f04784 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
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.system;
import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.constant.UserConstants;
@@ -21,6 +22,7 @@
import com.ruoyi.system.service.ISysUserService;
import com.smartor.mapper.SysUserDeptMapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -83,8 +85,8 @@
user.setPageNum(null);
user.setPageSize(null);
List<SysUser> total = userService.getUserList(user);
- rspData.put("total", total.size());
-
+ if (CollectionUtils.isNotEmpty(total)) rspData.put("total", total.size());
+ else rspData.put("total", 0);
return rspData;
}
@@ -123,7 +125,16 @@
log.info("--------userId鐨勫�间负锛歿}", userId);
userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
- List<SysRole> roles = roleService.selectRoleAll();
+
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ log.info("--------user鐨勫�间负锛歿}", user);
+
+ SysRole roleVo = new SysRole();
+ roleVo.setOrgid(user.getOrgid());
+ List<SysRole> roles = roleService.selectRoleList(roleVo);
+ log.info("--------roles鐨勫�间负锛歿}", roles);
+
ajax.put("roles", isAdmin.contains(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll());
if (StringUtils.isNotNull(userId)) {
@@ -137,9 +148,7 @@
SysUserDept sysUserDept = new SysUserDept();
sysUserDept.setUserId(userId);
sysUserDept.setDeptType("1");
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
- log.info("--------user鐨勫�间负锛歿}", user);
+
sysUserDept.setOrgid(user.getOrgid());
sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
ajax.put("belongDepts", sysUserDeptKSs);
@@ -156,6 +165,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:user:add')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysUser user) {
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
@@ -177,6 +187,7 @@
*/
//@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysUser user) {
userService.checkUserAllowed(user);
--
Gitblit v1.9.3