From 4788c0abe7193191b3ca024b0f5f8fed196294bd Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 三月 2025 14:29:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index ed7ae34..82743d4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -61,6 +61,8 @@
@Autowired
private SysUserPostMapper userPostMapper;
@Autowired
+ private TDeptToUserService deptToUserService;
+ @Autowired
private TDeptToUserMapper deptToUserMapper;
@Autowired
@@ -495,7 +497,7 @@
deptToUser.setDeptId(deptId);
deptToUserList.add(deptToUser);
}
- userRoleMapper.insertBatchUserDept(deptToUserList);
+ deptToUserService.saveBatch(deptToUserList);
}
}
@@ -670,11 +672,12 @@
List<Long> userIds = list.stream().map(SysUserVO::getUserId).collect(Collectors.toList());
// 查询所有部门
List<TDept> depts = deptMapper.selectList(Wrappers.lambdaQuery(TDept.class));
- List<TDeptToUser> tDeptToUsers = deptToUserMapper.selectList(Wrappers.lambdaQuery(TDeptToUser.class)
+ List<TDeptToUser> tDeptToUsers = deptToUserService.list(Wrappers.lambdaQuery(TDeptToUser.class)
.in(TDeptToUser::getUserId, userIds));
for (SysUserVO sysUserVO : list) {
tDeptToUsers.stream().filter(tDeptToUser -> tDeptToUser.getUserId().equals(sysUserVO.getUserId())).forEach(tDeptToUser -> {
sysUserVO.setDeptList(depts.stream().filter(tDept -> tDept.getId().equals(tDeptToUser.getDeptId())).map(TDept::getDeptName).collect(Collectors.toList()));
+ sysUserVO.setDeptIds(depts.stream().map(TDept::getId).filter(id -> id.equals(tDeptToUser.getDeptId())).collect(Collectors.toList()));
});
}
pageInfo.setRecords(list);
--
Gitblit v1.7.1