diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/OrganizationServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/OrganizationServiceApi.java index a48896bae..21657ad38 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/OrganizationServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/OrganizationServiceApi.java @@ -2,6 +2,7 @@ package cn.stylefeng.roses.kernel.sys.api; import cn.stylefeng.roses.kernel.sys.api.enums.org.DetectModeEnum; import cn.stylefeng.roses.kernel.sys.api.pojo.org.CompanyDeptDTO; +import cn.stylefeng.roses.kernel.sys.api.pojo.org.HrOrganizationDTO; /** * 组织机构信息的api @@ -54,4 +55,12 @@ public interface OrganizationServiceApi { */ CompanyDeptDTO getOrgCompanyInfo(Long orgId); + /** + * 通过组织机构id获取组织机构信息 + * + * @author fengshuonan + * @since 2024/1/6 11:21 + */ + HrOrganizationDTO getOrgInfo(Long orgId); + } diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/org/HrOrganizationDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/org/HrOrganizationDTO.java new file mode 100644 index 000000000..dcf90f130 --- /dev/null +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/pojo/org/HrOrganizationDTO.java @@ -0,0 +1,83 @@ +/* + * Copyright [2020-2030] [https://www.stylefeng.cn] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Guns采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点: + * + * 1.请不要删除和修改根目录下的LICENSE文件。 + * 2.请不要删除和修改Guns源码头部的版权声明。 + * 3.请保留源码和相关描述文件的项目出处,作者声明等。 + * 4.分发源码时候,请注明软件出处 https://gitee.com/stylefeng/guns + * 5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/stylefeng/guns + * 6.若您的项目无法满足以上几点,可申请商业授权 + */ +package cn.stylefeng.roses.kernel.sys.api.pojo.org; + +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 组织机构信息 + * + * @author fengshuonan + * @since 2024/1/6 11:20 + */ +@Data +public class HrOrganizationDTO { + + /** + * 主键 + */ + @ChineseDescription("主键") + private Long orgId; + + /** + * 父id + */ + @ChineseDescription("父id") + private Long orgParentId; + + /** + * 父ids + */ + @ChineseDescription("父ids") + private String orgPids; + + /** + * 组织名称 + */ + @ChineseDescription("组织名称") + private String orgName; + + /** + * 组织机构简称 + */ + @ChineseDescription("组织机构简称") + private String orgShortName; + + /** + * 组织编码 + */ + @ChineseDescription("组织编码") + private String orgCode; + + /** + * 排序 + */ + @ChineseDescription("排序") + private BigDecimal orgSort; + +} 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 2df3f370f..f78fe14d3 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 @@ -25,6 +25,7 @@ import cn.stylefeng.roses.kernel.sys.api.enums.org.DetectModeEnum; import cn.stylefeng.roses.kernel.sys.api.enums.org.OrgTypeEnum; import cn.stylefeng.roses.kernel.sys.api.exception.enums.OrgExceptionEnum; import cn.stylefeng.roses.kernel.sys.api.pojo.org.CompanyDeptDTO; +import cn.stylefeng.roses.kernel.sys.api.pojo.org.HrOrganizationDTO; import cn.stylefeng.roses.kernel.sys.modular.org.constants.OrgConstants; import cn.stylefeng.roses.kernel.sys.modular.org.entity.HrOrganization; import cn.stylefeng.roses.kernel.sys.modular.org.factory.OrganizationFactory; @@ -355,6 +356,25 @@ public class HrOrganizationServiceImpl extends ServiceImpl hrOrganizationLambdaQueryWrapper = new LambdaQueryWrapper<>(); + hrOrganizationLambdaQueryWrapper.eq(HrOrganization::getOrgId, orgId); + hrOrganizationLambdaQueryWrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgParentId, HrOrganization::getOrgPids, + HrOrganization::getOrgName, HrOrganization::getOrgShortName, HrOrganization::getOrgSort, HrOrganization::getOrgCode); + HrOrganization hrOrganization = this.getOne(hrOrganizationLambdaQueryWrapper, false); + + if (ObjectUtil.isEmpty(hrOrganization)) { + return new HrOrganizationDTO(); + } + + HrOrganizationDTO hrOrganizationDTO = new HrOrganizationDTO(); + BeanUtil.copyProperties(hrOrganization, hrOrganizationDTO); + return hrOrganizationDTO; + } + @Override public HomeCompanyInfo orgStatInfo() {