From 1c4dc035cfc0e67845582e4bc2d217f593cbfcae Mon Sep 17 00:00:00 2001 From: yxx <1392859652@qq.com> Date: Thu, 1 Sep 2022 16:43:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84DTO?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=BA=E6=9E=84=E7=B1=BB=E5=9E=8B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/pojo/organization/HrOrganizationDTO.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java index 2dc81565f..658a150cd 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationDTO.java @@ -24,6 +24,8 @@ */ package cn.stylefeng.roses.kernel.system.api.pojo.organization; +import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; @@ -72,6 +74,11 @@ public class HrOrganizationDTO { */ private Integer statusFlag; + /** + * 组织机构类型：1-公司，2-部门 + */ + private Integer orgType; + /** * 组织机构描述 */ From 3f122e7f176e35b5e7f18eac67e932ff8695d8aa Mon Sep 17 00:00:00 2001 From: yxx <1392859652@qq.com> Date: Fri, 2 Sep 2022 08:53:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=9C=89=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20=E6=89=80=E4=BB=A5=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=81=9A=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8C=85=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system-business-organization/pom.xml | 7 +++ .../controller/HrOrganizationController.java | 3 ++ .../wrapper/OrgExpandWrapper.java | 49 +++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java diff --git a/kernel-s-system/system-business-organization/pom.xml b/kernel-s-system/system-business-organization/pom.xml index 1e314e126..1c0c500a3 100644 --- a/kernel-s-system/system-business-organization/pom.xml +++ b/kernel-s-system/system-business-organization/pom.xml @@ -54,6 +54,13 @@ spring-boot-starter-web + + + + cn.stylefeng.roses + wrapper-api + ${roses.version} + diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java index 009f0fc6b..9068e94f8 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java @@ -37,6 +37,8 @@ import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationRequ import cn.stylefeng.roses.kernel.system.api.pojo.organization.OrganizationTreeNode; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization; import cn.stylefeng.roses.kernel.system.modular.organization.service.HrOrganizationService; +import cn.stylefeng.roses.kernel.system.modular.organization.wrapper.OrgExpandWrapper; +import cn.stylefeng.roses.kernel.wrapper.api.annotation.Wrapper; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -126,6 +128,7 @@ public class HrOrganizationController { * @author fengshuonan * @date 2020/11/04 11:05 */ + @Wrapper(OrgExpandWrapper.class) @GetResource(name = "分页查询系统组织机构", path = "/hrOrganization/page") public ResponseData> page(HrOrganizationRequest hrOrganizationRequest) { return new SuccessResponseData<>(hrOrganizationService.findPage(hrOrganizationRequest)); diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java new file mode 100644 index 000000000..2b6ac9003 --- /dev/null +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java @@ -0,0 +1,49 @@ +/* + * 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.system.modular.organization.wrapper; + +import cn.hutool.extra.spring.SpringUtil; +import cn.stylefeng.roses.kernel.expand.modular.api.ExpandApi; +import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization; +import cn.stylefeng.roses.kernel.wrapper.api.BaseWrapper; + + +import java.util.Map; + +/** + * 组织机构的拓展 + * + * @author yxx + * @date 2022/09/01 18:10 + */ +public class OrgExpandWrapper implements BaseWrapper { + + @Override + public Map doWrap(HrOrganization beWrappedModel) { + ExpandApi expandApi = SpringUtil.getBean(ExpandApi.class); + return expandApi.getExpandDataInfo("org_expand", beWrappedModel.getOrgId()); + } + +}