mirror of https://gitee.com/stylefeng/roses
【7.6.0】【user】更新获取用户组织机构列表方法
parent
647e68854e
commit
da7eddb12c
|
@ -27,6 +27,7 @@ package cn.stylefeng.roses.kernel.system.api;
|
|||
import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO;
|
||||
import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserOrgDTO;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
|
@ -70,4 +71,12 @@ public interface UserOrgServiceApi {
|
|||
*/
|
||||
HrOrganizationDTO getUserCompany(Long userId);
|
||||
|
||||
/**
|
||||
* 获取当前登录用户的公司列表
|
||||
*
|
||||
* @author fengshuonan
|
||||
* @since 2023/4/17 17:11
|
||||
*/
|
||||
List<HrOrganizationDTO> getUserCompanyList();
|
||||
|
||||
}
|
||||
|
|
|
@ -92,7 +92,7 @@ public class SysUserOrgController {
|
|||
break;
|
||||
}
|
||||
}
|
||||
if (!orgIdRightFlag) {
|
||||
if (!orgIdRightFlag && !LoginContext.me().getSuperAdminFlag()) {
|
||||
throw new ServiceException(SysUserOrgExceptionEnum.CANT_CHANGE_ORG_ID);
|
||||
}
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<!--用户列表sql-->
|
||||
<sql id="user_list_mysql">
|
||||
select
|
||||
select distinct
|
||||
suser.user_id as userId,
|
||||
suser.account as account,
|
||||
suser.nick_name as nickName,
|
||||
|
@ -16,10 +16,10 @@
|
|||
suser.phone as phone,
|
||||
suser.tel as tel,
|
||||
suser.status_flag as statusFlag,
|
||||
suorg.org_id as orgId,
|
||||
suorg.position_id as positionId,
|
||||
hpos.position_name as positionName,
|
||||
hrorg.org_name as orgName
|
||||
hrorg.org_name as orgName,
|
||||
suser.create_time as createTime
|
||||
from sys_user suser
|
||||
left join sys_user_org suorg on suser.user_id = suorg.user_id
|
||||
left join hr_position hpos on suorg.position_id = hpos.position_id
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package cn.stylefeng.roses.kernel.system.modular.user.service;
|
||||
|
||||
import cn.stylefeng.roses.kernel.system.api.UserOrgServiceApi;
|
||||
import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO;
|
||||
import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserOrgRequest;
|
||||
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserOrg;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
@ -136,12 +135,4 @@ public interface SysUserOrgService extends IService<SysUserOrg>, UserOrgServiceA
|
|||
*/
|
||||
List<SysUserOrg> findList(UserOrgRequest userOrgResponse);
|
||||
|
||||
/**
|
||||
* 获取当前登录用户的公司列表
|
||||
*
|
||||
* @author fengshuonan
|
||||
* @since 2023/4/17 17:11
|
||||
*/
|
||||
List<HrOrganizationDTO> getUserCompanyList();
|
||||
|
||||
}
|
||||
|
|
|
@ -29,6 +29,7 @@ import cn.hutool.core.util.ObjectUtil;
|
|||
import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
|
||||
import cn.stylefeng.roses.kernel.auth.api.pojo.login.LoginUser;
|
||||
import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi;
|
||||
import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
|
||||
import cn.stylefeng.roses.kernel.system.api.OrganizationServiceApi;
|
||||
import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException;
|
||||
import cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserOrgExceptionEnum;
|
||||
|
@ -286,6 +287,7 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
|
|||
queryWrapper.eq(ObjectUtil.isNotEmpty(userOrgResponse.getUserId()), SysUserOrg::getUserId, userOrgResponse.getUserId());
|
||||
queryWrapper.eq(ObjectUtil.isNotEmpty(userOrgResponse.getOrgId()), SysUserOrg::getOrgId, userOrgResponse.getOrgId());
|
||||
queryWrapper.eq(ObjectUtil.isNotEmpty(userOrgResponse.getPositionId()), SysUserOrg::getPositionId, userOrgResponse.getPositionId());
|
||||
queryWrapper.eq(SysUserOrg::getMainFlag, YesOrNotEnum.Y.getKey());
|
||||
return queryWrapper;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue