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