From d9365ca376745ea4735b7524cab599725bf2830b Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Fri, 1 Apr 2022 14:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.2=E3=80=91=E3=80=90expand=E3=80=91?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E5=A2=9E=E5=8A=A0=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/HrOrganizationRequest.java    |  7 +++++++
 .../impl/HrOrganizationServiceImpl.java        | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java
index 1eec67a03..7583b6b06 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/pojo/organization/HrOrganizationRequest.java
@@ -24,6 +24,7 @@
  */
 package cn.stylefeng.roses.kernel.system.api.pojo.organization;
 
+import cn.stylefeng.roses.kernel.expand.modular.api.pojo.ExpandDataInfo;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
 import cn.stylefeng.roses.kernel.validator.api.validators.status.StatusValue;
@@ -121,6 +122,12 @@ public class HrOrganizationRequest extends BaseRequest {
     @ChineseDescription("用户id（作为查询条件）")
     private Long userId;
 
+    /**
+     * 动态表单数据
+     */
+    @ChineseDescription("动态表单数据")
+    private ExpandDataInfo expandDataInfo;
+
     /**
      * 组织机构树zTree形式
      */
diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
index a97db89d8..501ba35d5 100644
--- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
+++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
@@ -37,6 +37,7 @@ import cn.stylefeng.roses.kernel.db.api.context.DbOperatorContext;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
+import cn.stylefeng.roses.kernel.expand.modular.api.ExpandApi;
 import cn.stylefeng.roses.kernel.rule.constants.SymbolConstant;
 import cn.stylefeng.roses.kernel.rule.constants.TreeConstants;
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
@@ -90,7 +91,11 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
     @Resource
     private RoleDataScopeServiceApi roleDataScopeServiceApi;
 
+    @Resource
+    private ExpandApi expandApi;
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void add(HrOrganizationRequest hrOrganizationRequest) {
 
         // 获取父id
@@ -109,6 +114,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         hrOrganization.setStatusFlag(StatusEnum.ENABLE.getCode());
 
         this.save(hrOrganization);
+
+        // 处理动态表单数据
+        if (hrOrganizationRequest.getExpandDataInfo() != null) {
+            hrOrganizationRequest.getExpandDataInfo().setPrimaryFieldValue(hrOrganization.getOrgId());
+            expandApi.saveOrUpdateExpandData(hrOrganizationRequest.getExpandDataInfo());
+        }
     }
 
     @Override
@@ -143,6 +154,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void edit(HrOrganizationRequest hrOrganizationRequest) {
 
         HrOrganization hrOrganization = this.queryOrganization(hrOrganizationRequest);
@@ -161,6 +173,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
 
         // 更新这条记录
         this.updateById(hrOrganization);
+
+        // 处理动态表单数据
+        if (hrOrganizationRequest.getExpandDataInfo() != null) {
+            hrOrganizationRequest.getExpandDataInfo().setPrimaryFieldValue(hrOrganization.getOrgId());
+            expandApi.saveOrUpdateExpandData(hrOrganizationRequest.getExpandDataInfo());
+        }
     }
 
     @Override