From 71c4428446f6d5692de5dd6d0b9451bbe046247b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 08 四月 2025 22:25:42 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 339331e..bfe1a5b 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
@@ -4,13 +4,11 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-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.entity.SysUserDept;
+import com.ruoyi.common.core.domain.entity.*;
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.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -19,8 +17,11 @@
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.smartor.mapper.SysUserDeptMapper;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -35,6 +36,7 @@
*
* @author ruoyi
*/
+@Slf4j
@RestController
@RequestMapping("/system/user")
public class SysUserController extends BaseController {
@@ -52,6 +54,9 @@
@Autowired
private SysUserDeptMapper sysUserDeptMapper;
+
+ @Value("${isAdmin}")
+ private List<Long> isAdmin;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
@@ -99,7 +104,7 @@
userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
List<SysRole> roles = roleService.selectRoleAll();
- ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+ 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)) {
SysUser sysUser = userService.selectUserById(userId);
@@ -213,7 +218,7 @@
SysUser user = userService.selectUserById(userId);
List<SysRole> roles = roleService.selectRolesByUserId(userId);
ajax.put("user", user);
- ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+ ajax.put("roles", isAdmin.contains(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
return ajax;
}
@@ -222,10 +227,16 @@
*/
//@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.GRANT)
- @PostMapping("/authRole")
- public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
+ @PostMapping("/authRole/insertAuthRole")
+ public AjaxResult insertAuthRole(@RequestBody AuthRole authRole) {
+ log.error("-----鐢ㄦ埛鎺堟潈瑙掕壊鐨勫叆鍙備负锛歶serId={},roleIds={}", authRole.getUserId(), authRole.getRoleIds());
+ if (ObjectUtils.isEmpty(authRole.getRoleIds())) {
+ throw new BaseException("瑙掕壊涓虹┖锛岃妫�鏌ヤ箣鍚庡啀娆″皾璇�");
+ }
+ Long[] roleIds = authRole.getRoleIds().stream().toArray(Long[]::new);
+ Long userId = authRole.getUserId();
userService.checkUserDataScope(userId);
- userService.insertUserAuth(userId, roleIds,getOrgid());
+ userService.insertUserAuth(userId, roleIds, getOrgid());
return success();
}
--
Gitblit v1.9.3