From 08da7a676a52d59c0d6224b03ed681f5c51fb3b3 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 11 Oct 2024 17:52:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=91=E5=AE=9A=E9=9B=B6=E9=83=A8?=
 =?UTF-8?q?=E4=BB=B6=E6=9D=A1=E6=AC=BE=E5=8F=B7=E6=8E=92=E5=BA=8F=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsBindPartServiceImpl.java       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/bindPart/service/impl/LawsBindPartServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/bindPart/service/impl/LawsBindPartServiceImpl.java
index 39f8e470..49d61034 100644
--- a/laws-modules/src/main/java/com/jero/modules/bindPart/service/impl/LawsBindPartServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/bindPart/service/impl/LawsBindPartServiceImpl.java
@@ -373,6 +373,13 @@ public class LawsBindPartServiceImpl extends ServiceImpl<LawsBindPartMapper, Law
         return null;
     }
 
+    private double parseStringToDouble(String str) {
+        try {
+            return Double.parseDouble(str);
+        } catch (NumberFormatException e) {
+            return Double.MAX_VALUE; // 确保非数值类型的字符排在最后
+        }
+    }
 
     private void sendMessageToBindUser(LawsBindPart lawsBindPart) {
         String userId = UserUtils.getUserId();
@@ -384,8 +391,10 @@ public class LawsBindPartServiceImpl extends ServiceImpl<LawsBindPartMapper, Law
         } else {
             List<String> clauseIdList = Arrays.asList(clauseIds.split(","));
             List<LawsDocumentSplit> lawsDocumentSplits = documentSplitMapper.selectBatchIds(clauseIdList);
-            String clause = lawsDocumentSplits.stream().sorted()
-                    .map(LawsDocumentSplit::getItemNum).collect(Collectors.joining(","));
+            String clause = lawsDocumentSplits.stream()
+                    .sorted(Comparator.comparing(LawsDocumentSplit::getItemNum, Comparator.comparingDouble(this::parseStringToDouble)))
+                    .map(LawsDocumentSplit::getItemNum)
+                    .collect(Collectors.joining(","));
             String msg = "的" + clause + "条款";
             sendMap.put("clause", msg);
         }