From c7e4ec95579a47c26667eb79a586420012e605f6 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Wed, 15 Apr 2026 17:57:16 +0800
Subject: [PATCH] =?UTF-8?q?fix[project]:=20=E4=BF=AE=E6=94=B9=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5MES=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=BA=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LyricInternalServiceImpl.java        | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
index 6829f1e4..fe29623a 100644
--- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
@@ -245,6 +245,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
 
     // 用于判断查询事业部用户信息的一些常量
     private static final String DESIGN_PHASE = "设计";
+    private static final String UN_DESIGN_PHASE = "非设计";
     private static final String STRUCTURE = "结构仿真";
     private static final String TECHNOLOGY_CENTER = "技术中心";
 
@@ -4720,25 +4721,17 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
      * @param projectUndertaker
      * @return
      */
-    private SysDeptUserResp queryMemberByGroup(String projectUndertaker, String currenPhase) {
-        String deptName;
-        if (DESIGN_PHASE.equals(currenPhase)) {
-            deptName = projectUndertaker + "-" + STRUCTURE;
-        } else {
-            deptName = projectUndertaker + "-" + STRUCTURE + "-" + TECHNOLOGY_CENTER;
-        }
-        // 待调用system的查询部门用户feign接口
+    private SysDeptUserResp queryMemberByGroup(String projectUndertaker, String currentPhase) {
         DeptQueryReq req = new DeptQueryReq();
-        req.setDeptName(deptName);
-        req.setCurrent(1);
-        req.setSize(1);
-        log.info("listDept params：{}", req);
-        SdmResponse<PageDataResp<List<SysDeptUserResp>>> pageDataRespSdmResponse = sysDeptFeignClient.listDept(req);
-        SysDeptUserResp sysDeptUserResp = null;
-        if (pageDataRespSdmResponse.isSuccess()) {
-            sysDeptUserResp = pageDataRespSdmResponse.getData().getData().get(0);
+        req.setDeptName(projectUndertaker);
+        req.setDiscipline(STRUCTURE);
+        SdmResponse<List<SysDeptUserResp>> resp = sysDeptFeignClient.queryByDeptAndDiscipline(req);
+        List<SysDeptUserResp> userRespList = resp.getData();
+        if (!resp.isSuccess() || CollectionUtils.isEmpty(userRespList)) {
+            return null;
         }
-        return sysDeptUserResp;
+        String stage = DESIGN_PHASE.equals(currentPhase) ? DESIGN_PHASE : UN_DESIGN_PHASE;
+        return userRespList.stream().filter(userResp -> stage.equals(userResp.getStage())).findFirst().orElse(null);
     }
 
     private List<SpdmProjectNodeEditReq> syncProjectInfo(LyricVProjectToDM lyricVProjectToDM, Long tenantId, Long userId, String jobNumber, String userName) {