gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.6.0】更新获取公司的顺序问题

pull/55/MERGE
fengshuonan 2023-06-14 10:26:10 +08:00
parent 656e2573bf
commit ab1a0860fe
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java
View File

@ -226,35 +226,16 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
LoginUser loginUser = LoginContext.me().getLoginUser(); LoginUser loginUser = LoginContext.me().getLoginUser();
// 获取当前登录用户的组织机构id，放在第一位
Long currentOrgId = loginUser.getOrganizationId();
// 获取当前用户orgId的公司信息
HrOrganizationDTO currentCompanyInfo = organizationServiceApi.getOrgCompanyInfo(currentOrgId);
if (currentCompanyInfo != null) {
results.add(currentCompanyInfo);
}
// 获取当前用户绑定的组织机构列表 // 获取当前用户绑定的组织机构列表
UserOrgRequest userOrgResponse = new UserOrgRequest(); UserOrgRequest userOrgResponse = new UserOrgRequest();
userOrgResponse.setUserId(loginUser.getUserId()); userOrgResponse.setUserId(loginUser.getUserId());
List<SysUserOrg> sysUserOrgList = this.findList(userOrgResponse); List<SysUserOrg> sysUserOrgList = this.findList(userOrgResponse);
for (SysUserOrg sysUserOrg : sysUserOrgList) { for (SysUserOrg sysUserOrg : sysUserOrgList) {
// 公司id已经添加到列表中，不用再继续添加
if (currentCompanyInfo.getOrgId().equals(sysUserOrg.getOrgId())) {
continue;
}
// 获取用户的公司信息 // 获取用户的公司信息
HrOrganizationDTO companyInfo = organizationServiceApi.getOrgCompanyInfo(sysUserOrg.getOrgId()); HrOrganizationDTO companyInfo = organizationServiceApi.getOrgCompanyInfo(sysUserOrg.getOrgId());
if (companyInfo == null) { if (companyInfo == null) {
continue; continue;
} }
if (currentCompanyInfo.getOrgId().equals(companyInfo.getOrgId())) {
continue;
}
results.add(companyInfo); results.add(companyInfo);
} }