From 3d8da5a30b40646f1e6d8d5fb611f0822c7f0e8b Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 17 Jul 2023 15:37:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=E8=AF=A6=E6=83=85=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/format/OrgDetailFormatProcess.java    | 42 +++++++++++++++++++
 .../response/RoleBindDataScopeResponse.java   |  4 +-
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/format/OrgDetailFormatProcess.java

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/format/OrgDetailFormatProcess.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/format/OrgDetailFormatProcess.java
new file mode 100644
index 000000000..013164161
--- /dev/null
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/format/OrgDetailFormatProcess.java
@@ -0,0 +1,42 @@
+package cn.stylefeng.roses.kernel.sys.api.format;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.extra.spring.SpringUtil;
+import cn.stylefeng.roses.kernel.rule.format.BaseSimpleFieldFormatProcess;
+import cn.stylefeng.roses.kernel.sys.api.OrganizationServiceApi;
+
+import java.util.HashMap;
+
+/**
+ * 组织机构id格式化为获取机构的详情
+ *
+ * @author fengshuonan
+ * @since 2023/7/17 15:36
+ */
+public class OrgDetailFormatProcess extends BaseSimpleFieldFormatProcess {
+
+    @Override
+    public Class<?> getItemClass() {
+        return Long.class;
+    }
+
+    @Override
+    public Object simpleItemFormat(Object businessId) {
+
+        if (businessId == null) {
+            return null;
+        }
+
+        Long orgId = Convert.toLong(businessId);
+
+        OrganizationServiceApi organizationServiceApi = SpringUtil.getBean(OrganizationServiceApi.class);
+        String orgName = organizationServiceApi.getOrgNameById(orgId);
+
+        HashMap<String, Object> orgDetail = new HashMap<>();
+        orgDetail.put("orgId", orgId);
+        orgDetail.put("orgName", orgName);
+
+        return orgDetail;
+    }
+
+}
diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/response/RoleBindDataScopeResponse.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/response/RoleBindDataScopeResponse.java
index 508ff741d..947fde56a 100644
--- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/response/RoleBindDataScopeResponse.java
+++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/response/RoleBindDataScopeResponse.java
@@ -26,7 +26,7 @@ package cn.stylefeng.roses.kernel.sys.modular.role.pojo.response;
 
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat;
-import cn.stylefeng.roses.kernel.sys.api.format.OrgNameFormatProcess;
+import cn.stylefeng.roses.kernel.sys.api.format.OrgDetailFormatProcess;
 import lombok.Data;
 
 import java.util.List;
@@ -50,7 +50,7 @@ public class RoleBindDataScopeResponse {
      * 用户拥有的指定部门的组织机构信息id集合
      */
     @ChineseDescription("用户拥有的指定部门的组织机构信息id集合")
-    @SimpleFieldFormat(processClass = OrgNameFormatProcess.class)
+    @SimpleFieldFormat(processClass = OrgDetailFormatProcess.class)
     private List<Long> orgIdList;
 
 }