From da7eddb12c48beceac148bd42efdc17d4e45299d Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 11 May 2023 14:02:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90user=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84=E5=88=97=E8=A1=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/system/api/UserOrgServiceApi.java | 9 +++++++++ .../modular/user/controller/SysUserOrgController.java | 2 +- .../system/modular/user/mapper/mapping/SysUserMapper.xml | 6 +++--- .../system/modular/user/service/SysUserOrgService.java | 9 --------- .../user/service/impl/SysUserOrgServiceServiceImpl.java | 2 ++ 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java index 6690e84c9..02ae43b54 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/UserOrgServiceApi.java @@ -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 getUserCompanyList(); + } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java index d7a45fe23..d7f9350f1 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java @@ -92,7 +92,7 @@ public class SysUserOrgController { break; } } - if (!orgIdRightFlag) { + if (!orgIdRightFlag && !LoginContext.me().getSuperAdminFlag()) { throw new ServiceException(SysUserOrgExceptionEnum.CANT_CHANGE_ORG_ID); } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml index 3fe5a8e10..41845447f 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml @@ -4,7 +4,7 @@ - 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 diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java index 35f61a656..16b74c2f1 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java @@ -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, UserOrgServiceA */ List findList(UserOrgRequest userOrgResponse); - /** - * 获取当前登录用户的公司列表 - * - * @author fengshuonan - * @since 2023/4/17 17:11 - */ - List getUserCompanyList(); - } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java index 42cd01776..bd9790722 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java @@ -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