From 94462d19bb33abe9654781d791ae0163a3e0e37e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 27 一月 2026 16:29:07 +0800
Subject: [PATCH] 【丽水】微信已发送、已领取视为发送成功,不再进行补偿 改为 当前发送方式为微信的,且下一发送方式为短信的,微信发送状态为已发送、已领取的,跳过短信步骤

---
 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