From 4613099dca2d4e1c7b46a69a98bb4c210312ac57 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 16 四月 2025 11:15:37 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 24 ++++++++++++++++++------
1 files changed, 18 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 fdf2888..cde3492 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,7 +17,9 @@
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;
@@ -36,6 +36,7 @@
*
* @author ruoyi
*/
+@Slf4j
@RestController
@RequestMapping("/system/user")
public class SysUserController extends BaseController {
@@ -100,6 +101,7 @@
//@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping("/getInfo/{userId}")
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+ log.error("--------userId鐨勫�间负锛歿}",userId);
userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
List<SysRole> roles = roleService.selectRoleAll();
@@ -116,6 +118,10 @@
SysUserDept sysUserDept = new SysUserDept();
sysUserDept.setUserId(userId);
sysUserDept.setDeptType("1");
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ log.error("--------user鐨勫�间负锛歿}",user);
+ sysUserDept.setOrgid(user.getOrgid());
sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
ajax.put("belongDepts", sysUserDeptKSs);
@@ -226,8 +232,14 @@
*/
//@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());
return success();
--
Gitblit v1.9.3