From 651b12ac48778985b8897eacd2e4f12987b8c1c6 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 16 Jan 2024 20:16:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.0=E3=80=91=E3=80=90log=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0=E7=9A=84?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../log/api/pojo/record/LogRecordDTO.java     |  2 +
 .../api/format/CompanyNameFormatProcess.java  | 44 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/format/CompanyNameFormatProcess.java

diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java
index 2ff37d80b..a1da77d66 100644
--- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java
+++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/record/LogRecordDTO.java
@@ -26,6 +26,7 @@ package cn.stylefeng.roses.kernel.log.api.pojo.record;
 
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat;
+import cn.stylefeng.roses.kernel.sys.api.format.CompanyNameFormatProcess;
 import cn.stylefeng.roses.kernel.sys.api.format.UserNameFormatProcess;
 import lombok.Data;
 
@@ -105,6 +106,7 @@ public class LogRecordDTO {
      * 如果是http请求，并且用户已经登录，可以带这项
      */
     @ChineseDescription("用户请求时候的登录机构id")
+    @SimpleFieldFormat(processClass = CompanyNameFormatProcess.class)
     private Long userCurrentOrgId;
 
     /**
diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/format/CompanyNameFormatProcess.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/format/CompanyNameFormatProcess.java
new file mode 100644
index 000000000..fd2ac53f0
--- /dev/null
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/format/CompanyNameFormatProcess.java
@@ -0,0 +1,44 @@
+package cn.stylefeng.roses.kernel.sys.api.format;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import cn.stylefeng.roses.kernel.rule.format.BaseSimpleFieldFormatProcess;
+import cn.stylefeng.roses.kernel.sys.api.OrganizationServiceApi;
+import cn.stylefeng.roses.kernel.sys.api.pojo.org.CompanyDeptDTO;
+
+/**
+ * 获取公司名称的处理
+ *
+ * @author fengshuonan
+ * @since 2024-01-16 20:10
+ */
+public class CompanyNameFormatProcess extends BaseSimpleFieldFormatProcess {
+
+    private static final String NULL_ORG_NAME = "空";
+
+    @Override
+    public Class<?> getItemClass() {
+        return Long.class;
+    }
+
+    @Override
+    public Object simpleItemFormat(Object businessId) {
+
+        if (businessId == null) {
+            return NULL_ORG_NAME;
+        }
+
+        Long orgId = Convert.toLong(businessId);
+
+        OrganizationServiceApi organizationServiceApi = SpringUtil.getBean(OrganizationServiceApi.class);
+
+        CompanyDeptDTO orgCompanyInfo = organizationServiceApi.getOrgCompanyInfo(orgId);
+        if (ObjectUtil.isEmpty(orgCompanyInfo)) {
+            return NULL_ORG_NAME;
+        }
+
+        return orgCompanyInfo.getCompanyName();
+    }
+
+}