From c8db0d9987935b82c4a8ca97ce6aaafd19c1f707 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 02 六月 2026 17:33:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 08be9f2..9e15e50 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -120,10 +120,7 @@
List<SysRole> roles = roleService.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll());
- SysUserDeptVo sysUserDeptVo = new SysUserDeptVo();
- sysUserDeptVo.setUserId(userId);
- List<SysUserDeptVo> sysUserDeptVos = userDeptService.userLoginFacotryList(sysUserDeptVo);
- ajax.put("deptIds",sysUserDeptVos.stream().map(SysUserDeptVo::getDeptId).collect(Collectors.toList()));
+ ajax.put("deptIds", userService.selectDeptIdsByUserId(userId));
return ajax;
}
--
Gitblit v1.9.3