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

【7.6.0】更新用户详情，增加公司id

pull/55/MERGE
fengshuonan 2023-06-14 10:51:10 +08:00
parent ab1a0860fe
commit e20e226462
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/login/v3/IndexUserInfoV3.java
View File

@ -101,6 +101,12 @@ public class IndexUserInfoV3 {
@ChineseDescription("组织机构id")
private Long organizationId;
/**
* 用户所属公司id
*/
@ChineseDescription("用户所属公司id")
private Long companyId;
/**
* 用户状态
*/

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

@ -31,9 +31,11 @@ import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser;
import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo;
import cn.stylefeng.roses.kernel.rule.enums.SexEnum;
import cn.stylefeng.roses.kernel.system.api.MenuServiceApi;
import cn.stylefeng.roses.kernel.system.api.OrganizationServiceApi;
import cn.stylefeng.roses.kernel.system.api.enums.AntdvFrontTypeEnum;
import cn.stylefeng.roses.kernel.system.api.pojo.login.v3.IndexRoleInfo;
import cn.stylefeng.roses.kernel.system.api.pojo.login.v3.IndexUserInfoV3;
import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO;
import cn.stylefeng.roses.kernel.system.modular.user.service.IndexUserInfoService;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService;
import org.springframework.stereotype.Service;
@ -57,6 +59,9 @@ public class IndexUserInfoServiceImpl implements IndexUserInfoService {
@Resource
private MenuServiceApi menuServiceApi;
@Resource
private OrganizationServiceApi organizationServiceApi;
@Override
public IndexUserInfoV3 userInfoV3(Integer menuFrontType, Boolean devopsFlag) {
@ -96,6 +101,10 @@ public class IndexUserInfoServiceImpl implements IndexUserInfoService {
// 设置组织机构id
indexUserInfoV3.setOrganizationId(loginUser.getOrganizationId());
HrOrganizationDTO orgCompanyInfo = organizationServiceApi.getOrgCompanyInfo(loginUser.getOrganizationId());
if (orgCompanyInfo != null) {
indexUserInfoV3.setCompanyId(orgCompanyInfo.getOrgId());
}
// 设置状态（暂时不设置）
indexUserInfoV3.setStatus(null);