From 936f4bd8b7837051ff63773be6d2d9c4b402b168 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 10 三月 2026 09:56:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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..fd5f028 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/PlanServiceImpl.java
@@ -93,16 +93,17 @@
});
}
- 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) {
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