From 050549eb697c1d259d1263c6f1aae709ea1be003 Mon Sep 17 00:00:00 2001
From: guoqibing <guoqibing@sino-assistance.com>
Date: Thu, 27 Nov 2025 13:09:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java
index 536ec44..5be7006 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java
@@ -140,7 +140,8 @@ public class ZtKanbanlaneServiceImpl extends ServiceImpl<ZtKanbanlaneMapper, ZtK
                             }
                         }
                         //排序
-                        ztStoryDTOS.sort(Comparator.comparing(ZtStoryDTO::getPlanEndDate, Comparator.nullsLast(Comparator.naturalOrder()))
+                        ztStoryDTOS.sort(Comparator.comparing(ZtStoryDTO::getTestPlanEndTime, Comparator.nullsLast(Comparator.naturalOrder()))
+                                .thenComparing(ZtStoryDTO::getDevelPlanEndTime, Comparator.nullsLast(Comparator.naturalOrder()))
                                 .thenComparing(ZtStoryDTO::getPri, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(ZtStoryDTO::getId));
                         d.setList(ztStoryDTOS);
                     }else if("bug".equalsIgnoreCase(d.getCardType())){