From 56fa23b570c1509e57d8d48f6a6afdc4682dae01 Mon Sep 17 00:00:00 2001
From: lightming7 <ralfy@163.com>
Date: Thu, 29 Jan 2026 10:27:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=A5=E8=81=8C=E6=B3=95=E8=AD=A6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BD=BF=E7=94=A8=E6=8B=BC=E9=9F=B3=E5=BA=8F?=
 =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E9=BB=98=E8=AE=A4unicode=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bussiness/PubApiController.java           | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bussiness/PubApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bussiness/PubApiController.java
index d8dc549..a80fee7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bussiness/PubApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bussiness/PubApiController.java
@@ -1,7 +1,11 @@
 package com.ruoyi.web.controller.bussiness;
 
+import java.io.Serializable;
+import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,15 +77,29 @@ public class PubApiController extends BaseController {
         return obj.toString();
     }
 
+    public class PinyinComparator implements Comparator<String>, Serializable {
+        private static final long serialVersionUID = 1L;
+        final Collator collator;
+
+        public PinyinComparator() {
+            this.collator = Collator.getInstance(Locale.CHINESE);
+        }
+
+        public int compare(String o1, String o2) {
+            return this.collator.compare(o1, o2);
+        }
+    }
+
     @ApiOperation("履职法警列表")
     @GetMapping("/list_send_police")
     public AjaxResult listSendPolice(@RequestParam("unit_id") Long unitId)
     {
+        PinyinComparator pinyinComparator = new PinyinComparator();
         JwSendPoliceQueryReq req = new JwSendPoliceQueryReq();
         req.setUnitId(unitId.toString());
         req.setState("2");
         List<Map> results = iSendPoliceTaskStatService.JwSendPoliceCountList(req);
-        results.sort((u1, u2) -> objectToString(u1.get("remark")).compareTo(objectToString(u2.get("remark"))));
+        results.sort((u1, u2) -> pinyinComparator.compare(objectToString(u1.get("remark")), objectToString(u2.get("remark"))));
         return AjaxResult.success(results);
     }
 }

From ce41bb238f576dc8d78f3a9e7e2c89db43ec6712 Mon Sep 17 00:00:00 2001
From: lightming7 <ralfy@163.com>
Date: Thu, 29 Jan 2026 11:19:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AD=A6=E5=AF=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BD=BF=E7=94=A8=E6=8B=BC=E9=9F=B3=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bussiness/PubApiController.java           | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bussiness/PubApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bussiness/PubApiController.java
index a80fee7..733e857 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bussiness/PubApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bussiness/PubApiController.java
@@ -36,6 +36,19 @@ public class PubApiController extends BaseController {
     @Autowired
     private ISendPoliceTaskStatService iSendPoliceTaskStatService;
 
+    public class PinyinComparator implements Comparator<String>, Serializable {
+        private static final long serialVersionUID = 1L;
+        final Collator collator;
+
+        public PinyinComparator() {
+            this.collator = Collator.getInstance(Locale.CHINESE);
+        }
+
+        public int compare(String o1, String o2) {
+            return this.collator.compare(o1, o2);
+        }
+    }
+
     @ApiOperation("警察列表")
     @GetMapping("/list_police")
     public AjaxResult listPolice(@RequestParam("unit_id") Long unitId)
@@ -66,7 +79,8 @@ public class PubApiController extends BaseController {
             results.add(su);
         }
 
-        results.sort((u1, u2) -> u1.getRemark().compareTo(u2.getRemark()));
+        PinyinComparator pinyinComparator = new PinyinComparator();
+        results.sort((u1, u2) -> pinyinComparator.compare(u1.getRemark(), u2.getRemark()));
         return AjaxResult.success(results);
     }
 
@@ -77,19 +91,6 @@ public class PubApiController extends BaseController {
         return obj.toString();
     }
 
-    public class PinyinComparator implements Comparator<String>, Serializable {
-        private static final long serialVersionUID = 1L;
-        final Collator collator;
-
-        public PinyinComparator() {
-            this.collator = Collator.getInstance(Locale.CHINESE);
-        }
-
-        public int compare(String o1, String o2) {
-            return this.collator.compare(o1, o2);
-        }
-    }
-
     @ApiOperation("履职法警列表")
     @GetMapping("/list_send_police")
     public AjaxResult listSendPolice(@RequestParam("unit_id") Long unitId)