From fa3428b4bb32179a42d5618357c22fe2695716ae Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 13:58:23 +0800
Subject: [PATCH] 修改全局的注入方式

---
 src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java b/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java
index 0a32691..8abcd29 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java
@@ -16,7 +16,6 @@
 import com.ruoyi.projectManagement.vo.*;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -42,8 +41,7 @@
     private final PlanNodeMapper planNodeMapper;
 
     @Lazy
-    @Autowired
-    private PlanService planService;
+    private final PlanService planService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -93,16 +91,20 @@
         });
     }
 
-    private List<PlanNode> getPlanNodeByPlanId(Long planId) {
+    @Override
+    public List<PlanNode> getPlanNodeByPlanId(Long planId) {
         return planNodeMapper.selectList(new LambdaQueryWrapper<PlanNode>()
                 .eq(PlanNode::getIsDelete, 0)
-                .eq(PlanNode::getProjectManagementPlanId, planId));
+                .eq(PlanNode::getProjectManagementPlanId, planId).orderByAsc(PlanNode::getSort));
     }
 
     private List<PlanNode> getPlanNodeByPlanIds(List<Long> planIds) {
+        if(CollUtil.isEmpty(planIds)){
+            return Collections.emptyList();
+        }
         return planNodeMapper.selectList(new LambdaQueryWrapper<PlanNode>()
                 .eq(PlanNode::getIsDelete, 0)
-                .in(PlanNode::getProjectManagementPlanId, planIds));
+                .in(PlanNode::getProjectManagementPlanId, planIds).orderByAsc(PlanNode::getSort));
     }
 
 

--
Gitblit v1.9.3