From 253ea7035ead684b42ca8cd077f1744f96a38268 Mon Sep 17 00:00:00 2001
From: guoqibing <guoqibing@sino-assistance.com>
Date: Mon, 25 Aug 2025 15:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8E=92=E5=BA=8F=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ZtKanbanlaneServiceImpl.java       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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 cca7eaf..536ec44 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtKanbanlaneServiceImpl.java
@@ -140,8 +140,8 @@ public class ZtKanbanlaneServiceImpl extends ServiceImpl<ZtKanbanlaneMapper, ZtK
                             }
                         }
                         //排序
-                        ztStoryDTOS.sort(Comparator.comparing(ZtStoryDTO::getPlanEndDate, Comparator.nullsLast(Comparator.naturalOrder())).reversed()
-                                .thenComparing(ZtStoryDTO::getPri, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(ZtStoryDTO::getId,Comparator.reverseOrder()));
+                        ztStoryDTOS.sort(Comparator.comparing(ZtStoryDTO::getPlanEndDate, Comparator.nullsLast(Comparator.naturalOrder()))
+                                .thenComparing(ZtStoryDTO::getPri, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(ZtStoryDTO::getId));
                         d.setList(ztStoryDTOS);
                     }else if("bug".equalsIgnoreCase(d.getCardType())){
                         List<ZtBug> ztBugs = bugService.bugListByIds(ids);
@@ -158,8 +158,9 @@ public class ZtKanbanlaneServiceImpl extends ServiceImpl<ZtKanbanlaneMapper, ZtK
                                 }
                             }
                         }
-                        ztBugDTOS.sort(Comparator.comparing(ZtBugDTO::getDeadline, Comparator.nullsLast(Comparator.naturalOrder())).reversed()
-                                .thenComparing(ZtBugDTO::getPri, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(ZtBugDTO::getId,Comparator.reverseOrder()));                        d.setList(ztBugDTOS);
+                        ztBugDTOS.sort(Comparator.comparing(ZtBugDTO::getDeadline, Comparator.nullsLast(Comparator.naturalOrder()))
+                                .thenComparing(ZtBugDTO::getPri, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(ZtBugDTO::getId));
+                        d.setList(ztBugDTOS);
                     }else if("task".equalsIgnoreCase(d.getCardType())){
                         List<ZtTask> ztTasks = taskService.taskListByIds(ids);
                         List<ZtTaskDTO> ztTaskDTOS =new ArrayList<>();
@@ -193,8 +194,8 @@ public class ZtKanbanlaneServiceImpl extends ServiceImpl<ZtKanbanlaneMapper, ZtK
 
                             }
                         }
-                        ztTaskDTOS.sort(Comparator.comparing(ZtTaskDTO::getDeadline, Comparator.nullsLast(Comparator.naturalOrder())).reversed()
-                                .thenComparing(ZtTaskDTO::getPri, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(ZtTaskDTO::getId,Comparator.reverseOrder()));
+                        ztTaskDTOS.sort(Comparator.comparing(ZtTaskDTO::getDeadline, Comparator.nullsLast(Comparator.naturalOrder()))
+                                .thenComparing(ZtTaskDTO::getPri, Comparator.nullsLast(Comparator.naturalOrder())).thenComparing(ZtTaskDTO::getId));
                         d.setList(ztTaskDTOS);
                     }
                 }