!36 【轻量级PR】组织机构DTO增加机构类型字段

Merge pull request !36 from 叶星/dev-7.2.5

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;
+
     /**
      * 组织机构描述
      */

kernel-s-system/system-business-organization/pom.xml

@@ -54,6 +54,13 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <!--包装器模块-->
+        <!--包装结果-->
+        <dependency>
+            <groupId>cn.stylefeng.roses</groupId>
+            <artifactId>wrapper-api</artifactId>
+            <version>${roses.version}</version>
+        </dependency>
     </dependencies>
 
 </project>

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<PageResult<HrOrganization>> page(HrOrganizationRequest hrOrganizationRequest) {
         return new SuccessResponseData<>(hrOrganizationService.findPage(hrOrganizationRequest));

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<HrOrganization> {
+
+    @Override
+    public Map<String, Object> doWrap(HrOrganization beWrappedModel) {
+        ExpandApi expandApi = SpringUtil.getBean(ExpandApi.class);
+        return expandApi.getExpandDataInfo("org_expand", beWrappedModel.getOrgId());
+    }
+
+}