From 083267633c3600401fa4ccfeea1438fc8b353ea7 Mon Sep 17 00:00:00 2001
From: zhanglei <xx@cenxi.online>
Date: Tue, 11 Aug 2026 13:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/executor/OrgInfoExecutor.java           | 17 +++++++++--------
 .../qinan/safetyeval/client/co/OrgInfoCO.java   |  2 ++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java
index 61926ea8..2ed6fe91 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgInfoExecutor.java
@@ -1,28 +1,25 @@
 package org.qinan.safetyeval.app.executor;
 
-import com.alibaba.fastjson.JSON;
+import org.qinan.safetyeval.app.convertor.OrgInfoConvertor;
 import org.qinan.safetyeval.client.api.OrgInfoApi;
-import org.qinan.safetyeval.client.dto.PageResponse;
-import org.qinan.safetyeval.client.dto.SingleResponse;
 import org.qinan.safetyeval.client.co.OrgInfoCO;
 import org.qinan.safetyeval.client.co.OrgInfoSelectCO;
-import org.qinan.safetyeval.client.dto.OrgInfoAddCmd;
-import org.qinan.safetyeval.client.dto.OrgInfoModifyCmd;
-import org.qinan.safetyeval.client.dto.OrgInfoPageQuery;
-import org.qinan.safetyeval.client.dto.OrgInfoUpdateStateCmd;
+import org.qinan.safetyeval.client.dto.*;
 import org.qinan.safetyeval.domain.entity.OrgInfoEntity;
 import org.qinan.safetyeval.domain.exception.BizException;
 import org.qinan.safetyeval.domain.exception.ErrorCode;
 import org.qinan.safetyeval.domain.query.OrgInfoQuery;
 import org.qinan.safetyeval.domain.query.PageResult;
 import org.qinan.safetyeval.domain.service.OrgInfoDomainService;
-import org.qinan.safetyeval.app.convertor.OrgInfoConvertor;
+import org.qinan.safetyeval.infrastructure.dataobject.AccountDO;
+import org.qinan.safetyeval.infrastructure.mapper.AccountMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -39,6 +36,8 @@ public class OrgInfoExecutor implements OrgInfoApi {
 
     @Autowired
     private OrgInfoConvertor orgInfoConvertor;
+    @Autowired
+    private AccountMapper accountMapper;
 
     @Override
     public SingleResponse<OrgInfoCO>  add(OrgInfoAddCmd cmd) {
@@ -248,6 +247,8 @@ public class OrgInfoExecutor implements OrgInfoApi {
         }
         OrgInfoCO co = new OrgInfoCO();
         co.setId(entity.getId());
+        AccountDO accountDO = accountMapper.selectById(entity.getCreateId());
+        co.setAccount(Objects.isNull(accountDO) ? null : accountDO.getAccount());
         co.setUnitName(entity.getUnitName());
         co.setCreditCode(entity.getCreditCode());
         co.setSafetyIndustryCategoryCode(entity.getSafetyIndustryCategoryCode());
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java
index a5d96cdc..443a7b33 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/OrgInfoCO.java
@@ -186,5 +186,7 @@ public class OrgInfoCO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
+    @ApiModelProperty(value = "账号")
+    private String account;
 
 }