mirror of https://gitee.com/stylefeng/roses
【8.1.0】【org】获取机构列表,更新筛选条件
parent
944fec4ed0
commit
7d95e327c0
|
@ -26,10 +26,12 @@ public interface SysUserOrgServiceApi {
|
|||
/**
|
||||
* 获取用户绑定的组织机构列表,主要任职部门和次要任职部门都返回
|
||||
*
|
||||
* @param userId 用户id
|
||||
* @param getTotalOrg 是否获取用户所属的所有组织机构,true-获取所有,false-只获取启用的部门
|
||||
* @author fengshuonan
|
||||
* @since 2023/6/11 21:08
|
||||
*/
|
||||
List<UserOrgDTO> getUserOrgList(Long userId);
|
||||
List<UserOrgDTO> getUserOrgList(Long userId, boolean getTotalOrg);
|
||||
|
||||
/**
|
||||
* 获取某个机构下的所有用户id集合
|
||||
|
|
|
@ -159,7 +159,7 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgMapper, SysUser
|
|||
}
|
||||
|
||||
@Override
|
||||
public List<UserOrgDTO> getUserOrgList(Long userId) {
|
||||
public List<UserOrgDTO> getUserOrgList(Long userId, boolean getTotalOrg) {
|
||||
|
||||
if (userId == null) {
|
||||
return null;
|
||||
|
@ -168,7 +168,9 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgMapper, SysUser
|
|||
// 获取用户所有的部门信息(只查询用户启用的部门)
|
||||
LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.eq(SysUserOrg::getUserId, userId);
|
||||
queryWrapper.eq(SysUserOrg::getStatusFlag, StatusEnum.ENABLE.getCode());
|
||||
if (!getTotalOrg) {
|
||||
queryWrapper.eq(SysUserOrg::getStatusFlag, StatusEnum.ENABLE.getCode());
|
||||
}
|
||||
queryWrapper.orderByDesc(SysUserOrg::getMainFlag);
|
||||
List<SysUserOrg> sysUserOrgList = this.list(queryWrapper);
|
||||
|
||||
|
|
|
@ -214,7 +214,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
SysUser sysUser = this.getOne(sysUserLambdaQueryWrapper, false);
|
||||
|
||||
// 获取用户的组织机构信息
|
||||
List<UserOrgDTO> userOrgList = sysUserOrgService.getUserOrgList(sysUser.getUserId());
|
||||
List<UserOrgDTO> userOrgList = sysUserOrgService.getUserOrgList(sysUser.getUserId(), true);
|
||||
sysUser.setUserOrgDTOList(userOrgList);
|
||||
|
||||
// 获取用户的角色信息
|
||||
|
|
|
@ -128,8 +128,7 @@ public class UserIndexInfoService {
|
|||
loginUser.setCurrentOrgId(updateUserOrgAppRequest.getNewOrgId());
|
||||
|
||||
// 设置用户在当前机构下的职位id
|
||||
Long positionId = sysUserOrgServiceApi.getUserOrgPositionId(loginUser.getUserId(),
|
||||
updateUserOrgAppRequest.getNewOrgId());
|
||||
Long positionId = sysUserOrgServiceApi.getUserOrgPositionId(loginUser.getUserId(), updateUserOrgAppRequest.getNewOrgId());
|
||||
loginUser.setCurrentPositionId(positionId);
|
||||
}
|
||||
|
||||
|
@ -176,7 +175,7 @@ public class UserIndexInfoService {
|
|||
Long currentOrgId = loginUser.getCurrentOrgId();
|
||||
|
||||
// 获取用户的所有组织机构集合
|
||||
List<UserOrgDTO> userOrgList = sysUserOrgServiceApi.getUserOrgList(loginUser.getUserId());
|
||||
List<UserOrgDTO> userOrgList = sysUserOrgServiceApi.getUserOrgList(loginUser.getUserId(), false);
|
||||
|
||||
// 查询到机构为空,直接返回
|
||||
if (ObjectUtil.isEmpty(userOrgList)) {
|
||||
|
|
Loading…
Reference in New Issue