From f32e51c12f24a2ab8545e2c2d753f0b4aea09904 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Thu, 19 Mar 2026 12:50:29 +0800
Subject: [PATCH] =?UTF-8?q?fix[project]:=20=E4=BF=AE=E6=94=B9=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sdm/project/dao/SimulationTaskMapper.java   |  2 +-
 .../project/service/impl/TaskServiceImpl.java   | 17 ++---------------
 .../resources/mapper/SimulationTaskMapper.xml   |  4 +++-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
index a5d8571d..8432a1ea 100644
--- a/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
+++ b/project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
@@ -21,7 +21,7 @@ import java.util.List;
 public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {
 
 
-    SdmResponse list(SpdmTaskListReq req);
+    List<SpdmNewTaskVo> list(@Param("tenantId") Long tenantId);
 
     List<SpdmTaskVo> getTaskList(@Param("tenantId") Long tenantId, @Param("req") SpdmTaskListReq req);
 
diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
index 18634027..f065f68a 100644
--- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
@@ -5053,23 +5053,11 @@ public class TaskServiceImpl implements ITaskService {
         }
         Integer resultType = req.getResultType();
         List<NodeMergeQueryResp> mergeQueryRespList = new ArrayList<>();
+        Long tenantId = ThreadLocalContext.getTenantId();
         // 如果是任务或算例就传：task或run，其他的传tag1到tag10
         String type = req.getType();
         if (MERGE_QUERY_TASK.equals(type) || MERGE_QUERY_RUN.equals(type)) {
-            SpdmTaskListReq taskListReq = new  SpdmTaskListReq();
-            taskListReq.setType(TaskQryTypeEnum.ALL.getCode());
-            taskListReq.setCurrent(1);
-            taskListReq.setSize(10000);
-            TaskNodeTag taskNodeTag = new TaskNodeTag();
-            taskNodeTag.setKey(null);
-            taskNodeTag.setValue("tag1");
-            taskListReq.setIdMap(Collections.singletonList(taskNodeTag));
-            SdmResponse response = list(taskListReq);
-            if (!response.isSuccess()) {
-                return SdmResponse.success(Collections.emptyList());
-            }
-            JSONObject dataObj = (JSONObject) response.getData();
-            List<SpdmNewTaskVo> taskVoList = (List<SpdmNewTaskVo>) dataObj.get("data");
+            List<SpdmNewTaskVo> taskVoList = mapper.list(tenantId);
             if (CollectionUtils.isEmpty(taskVoList)) {
                 return SdmResponse.success(Collections.emptyList());
             }
@@ -5108,7 +5096,6 @@ public class TaskServiceImpl implements ITaskService {
             if (StringUtils.isBlank(nodeType)) {
                 return SdmResponse.failed("系统中没有当前节点类型：{}",type);
             }
-            Long tenantId = ThreadLocalContext.getTenantId();
             List<SimulationNode> nodeList = nodeService.lambdaQuery().eq(SimulationNode::getNodeType, nodeType)
                     .eq(SimulationNode::getTenantId,tenantId).list();
             if (CollectionUtils.isEmpty(nodeList)) {
diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml
index 4e92da9d..e2c7568b 100644
--- a/project/src/main/resources/mapper/SimulationTaskMapper.xml
+++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml
@@ -85,7 +85,9 @@
     </delete>
 
 
-    <select id="list" resultType="com.sdm.common.common.SdmResponse"></select>
+    <select id="list" resultType="com.sdm.project.model.vo.SpdmNewTaskVo">
+        select * from simulation_task where tenant_Id = #{tenantId}
+    </select>
 
     <select id="getTaskList" resultType="com.sdm.common.entity.resp.project.SpdmTaskVo">
         select * from simulation_task where tenant_id = #{tenantId}