From 21a77721452f8fe24b61efaa660b2688c2b100cf Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 2 Nov 2023 10:23:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0.2=E3=80=91=E3=80=90hr=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=80=E4=B8=AA=E6=89=B9=E9=87=8F=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/controller/CommonOrgController.java | 16 ++++++++++++ .../org/service/HrOrganizationService.java | 9 +++++++ .../impl/HrOrganizationServiceImpl.java | 26 +++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/CommonOrgController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/CommonOrgController.java index 198925121..2cb246248 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/CommonOrgController.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/CommonOrgController.java @@ -1,6 +1,8 @@ package cn.stylefeng.roses.kernel.sys.modular.org.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; +import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; @@ -11,10 +13,12 @@ import cn.stylefeng.roses.kernel.sys.modular.org.pojo.request.CommonOrgTreeReque import cn.stylefeng.roses.kernel.sys.modular.org.pojo.request.HrOrganizationRequest; import cn.stylefeng.roses.kernel.sys.modular.org.pojo.response.CommonOrgTreeResponse; import cn.stylefeng.roses.kernel.sys.modular.org.service.HrOrganizationService; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * 通用组织机构接口 @@ -55,4 +59,16 @@ public class CommonOrgController { return new SuccessResponseData<>(hrOrganizationService.commonOrgPage(hrOrganizationRequest)); } + /** + * 获取机构名称集合，通过机构id的列表 + * + * @author fengshuonan + * @since 2023/11/2 10:16 + */ + @PostResource(name = "获取机构名称集合，通过机构id的列表", path = "/common/org/getOrgListName") + public ResponseData> getOrgListName( + @RequestBody @Validated(BaseRequest.batchDelete.class) HrOrganizationRequest hrOrganizationRequest) { + return new SuccessResponseData<>(hrOrganizationService.getOrgListName(hrOrganizationRequest)); + } + } diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrganizationService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrganizationService.java index 5b5988956..b2505eeec 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrganizationService.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrganizationService.java @@ -1,6 +1,7 @@ package cn.stylefeng.roses.kernel.sys.modular.org.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.sys.api.OrganizationServiceApi; import cn.stylefeng.roses.kernel.sys.api.pojo.org.CompanyDeptDTO; import cn.stylefeng.roses.kernel.sys.api.remote.OrgInfoRemoteApi; @@ -144,4 +145,12 @@ public interface HrOrganizationService extends IService, Organiz */ Boolean getOrgHaveSubFlag(Long orgId); + /** + * 批量获取组织机构名称 + * + * @author fengshuonan + * @since 2023/11/2 10:19 + */ + List getOrgListName(HrOrganizationRequest hrOrganizationRequest); + } \ No newline at end of file diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java index 6676faaed..2df3f370f 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java @@ -17,6 +17,7 @@ import cn.stylefeng.roses.kernel.event.sdk.publish.BusinessEventPublisher; import cn.stylefeng.roses.kernel.log.api.util.BusinessLogUtil; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; +import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveOrgCallbackApi; import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants; @@ -473,6 +474,31 @@ public class HrOrganizationServiceImpl extends ServiceImpl getOrgListName(HrOrganizationRequest hrOrganizationRequest) { + + List dictList = new ArrayList<>(); + + if (ObjectUtil.isEmpty(hrOrganizationRequest) || ObjectUtil.isEmpty(hrOrganizationRequest.getOrgIdList())) { + return dictList; + } + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(HrOrganization::getOrgId, hrOrganizationRequest.getOrgIdList()); + wrapper.select(HrOrganization::getOrgName, HrOrganization::getOrgId, HrOrganization::getOrgCode); + List list = this.list(wrapper); + + if (ObjectUtil.isEmpty(list)) { + return dictList; + } + + for (HrOrganization hrOrganization : list) { + dictList.add(new SimpleDict(hrOrganization.getOrgId(), hrOrganization.getOrgName(), hrOrganization.getOrgCode())); + } + + return dictList; + } + @Override public String getOrgNameById(Long orgId) {