From 8a025d3351fe4c6087c0dbf430624f4349e33d69 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 08:59:08 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysUserController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysUserController.java b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysUserController.java
index 000470d..2af07af 100644
--- a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysUserController.java
+++ b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/SysUserController.java
@@ -96,7 +96,14 @@
for (SysUserVO record : list.getRecords()) {
List<Long> collect1 = sysUserRoleService.lambdaQuery().eq(SysUserRole::getUserId, record.getUserId())
.list().stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
- record.setRole(collect1);
+ List<Long> longs1 = new ArrayList<>();
+ for (Long l : collect1) {
+ SysRole sysDept = roleService.selectRoleById(l);
+ if (sysDept!=null){
+ longs1.add(sysDept.getRoleId());
+ }
+ }
+ record.setRole(longs1);
List<String> strings1 = new ArrayList<>();
if (record.getRole()!=null && (!record.getRole().isEmpty())){
for (Long l : collect1) {
@@ -109,7 +116,14 @@
record.setRoleNames(strings1);
List<Long> collect2 = sysUserDeptService.lambdaQuery().eq(SysUserDept::getUserId, record.getUserId())
.list().stream().map(SysUserDept::getDeptId).collect(Collectors.toList());
- record.setDeptIds(collect2);
+ List<Long> longs2 = new ArrayList<>();
+ for (Long l : collect2) {
+ SysDept sysDept = deptService.selectDeptById(l);
+ if (sysDept!=null){
+ longs2.add(sysDept.getDeptId());
+ }
+ }
+ record.setDeptIds(longs2);
List<String> strings = new ArrayList<>();
if (record.getDeptIds()!=null && (!record.getDeptIds().isEmpty())){
for (Long deptId : record.getDeptIds()) {
--
Gitblit v1.7.1