From 0b8b3be32067368f4c8ca8812f69a7b3f48f1ce8 Mon Sep 17 00:00:00 2001 From: sinake <sinake1@qq.com> Date: 星期二, 26 八月 2025 17:05:05 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/smartor --- smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java index 706566b..599d1ef 100644 --- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java @@ -109,7 +109,8 @@ } } } - Collections.sort(serviceSubtaskDetailSET, Comparator.comparingLong(ServiceSubtaskDetail::getTemplatequestionnum)); + Collections.sort(serviceSubtaskDetailSET, + Comparator.comparing(ServiceSubtaskDetail::getTemplatequestionnum, Comparator.nullsLast(Long::compareTo))); map1.put("filteredDetails", serviceSubtaskDetailSET); map1.put("voice", ""); -- Gitblit v1.9.3