From 18712e1cbaff9a6eab694ec714070fbd0f2f1bb5 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Fri, 21 Feb 2025 16:05:32 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E4=B8=8B=E8=BD=BD=E5=90=88?=
 =?UTF-8?q?=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../response/GetOrgAuthStatesResponse.java    |  9 --------
 .../nanopart/ess/server/ess/QueryService.java | 22 +++++--------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetOrgAuthStatesResponse.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetOrgAuthStatesResponse.java
index 31c52e17..a0e9c013 100644
--- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetOrgAuthStatesResponse.java
+++ b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/response/GetOrgAuthStatesResponse.java
@@ -19,13 +19,4 @@ public class GetOrgAuthStatesResponse {
      */
     private boolean isAuthorized;
 
-    /**
-     * 单位创建人id
-     */
-    private Long createByPersonId;
-
-    /**
-     * 单位创建人姓名
-     */
-    private String createByPersonName;
 }
\ No newline at end of file
diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java
index 942703f0..33028d75 100644
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java
+++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/QueryService.java
@@ -34,9 +34,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import static java.util.Collections.emptyList;
 import static java.util.function.Function.identity;
@@ -59,26 +57,16 @@ public class QueryService {
 
     public List<GetOrgAuthStatesResponse> getOrgAuthStates(GetOrgAuthStatesRequest request) {
         List<EssOrg> orgs = essOrgDao.getByOuIds(request.getOuIds());
-        List<Long> creatorPersonIds = orgs.stream()
-                .map(EssOrg::getCreateByPersonId)
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
-        PersonProfiles personProfiles = PersonProfiles.wrap(essSupport.getPersonProfiles(creatorPersonIds));
         ArrayList<GetOrgAuthStatesResponse> responses = new ArrayList<>();
         for (Long ouId : request.getOuIds()) {
-            EssOrg org = orgs.stream()
-                    .filter(o -> o.getOuId().equals(ouId))
-                    .findFirst()
-                    .orElse(null);
             GetOrgAuthStatesResponse response = new GetOrgAuthStatesResponse();
             responses.add(response);
             response.setOuId(ouId);
-            response.setAuthorized(org != null && org.isAuthorized());
-            response.setCreateByPersonId(org == null ? null : org.getCreateByPersonId());
-            if (response.getCreateByPersonId() != null) {
-                PersonProfileDto person = personProfiles.findOrNull(response.getCreateByPersonId());
-                response.setCreateByPersonName(person == null ? "" : person.getRealName());
-            }
+            response.setAuthorized(orgs.stream()
+                    .filter(org -> org.getOuId().equals(ouId))
+                    .map(EssOrg::isAuthorized)
+                    .findFirst()
+                    .orElse(false));
         }
         return responses;
     }