zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'base-version/main' into dev

Browse Source
This commit is contained in:
chenbowen
2025-11-13 21:40:08 +08:00
parent 2eb09ff35d af7f103a38
commit 53a0293b7c
5 changed files with 33 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/dept/DeptServiceImpl.java
View File

@@ -504,10 +504,10 @@ public class DeptServiceImpl implements DeptService {
DeptDO company = companyId != null ? loadDept(companyId, deptCache) : findTopLevelAncestor(dept);
if (company == null) continue;
CompanyDeptInfo info = new CompanyDeptInfo();
info.setCompanyId(company.getId());
info.setCompanyId(String.valueOf(company.getId()));
info.setCompanyName(company.getName());
info.setCompanyCode(company.getCode());
info.setDeptId(dept.getId());
info.setDeptId(String.valueOf(dept.getId()));
info.setDeptName(dept.getName());
info.setDeptCode(dept.getCode());
result.add(info);

4
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/user/AdminUserServiceImpl.java
View File

@@ -360,8 +360,8 @@ public class AdminUserServiceImpl implements AdminUserService {
public AdminUserDO getUser(Long id) {
AdminUserDO adminUserDO = userMapper.selectListByIds(singleton(id)).stream().findFirst().orElseThrow(() -> exception(USER_NOT_EXISTS));
Set<CompanyDeptInfo> companyDeptInfoListByUserId = deptService.getCompanyDeptInfoListByUserId(id);
adminUserDO.setDeptIds(companyDeptInfoListByUserId.stream().map(CompanyDeptInfo::getDeptId).collect(Collectors.toSet()));
adminUserDO.setCompanyIds(companyDeptInfoListByUserId.stream().map(CompanyDeptInfo::getCompanyId).collect(Collectors.toSet()));
adminUserDO.setDeptIds(companyDeptInfoListByUserId.stream().map(CompanyDeptInfo::getDeptId).map(Long::valueOf).collect(Collectors.toSet()));
adminUserDO.setCompanyIds(companyDeptInfoListByUserId.stream().map(CompanyDeptInfo::getCompanyId).map(Long::valueOf).collect(Collectors.toSet()));
adminUserDO.setCompanyDeptInfos(companyDeptInfoListByUserId);
String deptNames = companyDeptInfoListByUserId.stream()
.map(CompanyDeptInfo::getDeptName)