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 0fe80dc..d8dc549 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 @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.bussiness; import java.util.ArrayList; import java.util.List; +import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -65,6 +66,13 @@ public class PubApiController extends BaseController { return AjaxResult.success(results); } + static final String objectToString(Object obj) { + if(obj == null) { + return ""; + } + return obj.toString(); + } + @ApiOperation("履职法警列表") @GetMapping("/list_send_police") public AjaxResult listSendPolice(@RequestParam("unit_id") Long unitId) @@ -72,6 +80,8 @@ public class PubApiController extends BaseController { JwSendPoliceQueryReq req = new JwSendPoliceQueryReq(); req.setUnitId(unitId.toString()); req.setState("2"); - return AjaxResult.success(iSendPoliceTaskStatService.JwSendPoliceCountList(req)); + List results = iSendPoliceTaskStatService.JwSendPoliceCountList(req); + results.sort((u1, u2) -> objectToString(u1.get("remark")).compareTo(objectToString(u2.get("remark")))); + return AjaxResult.success(results); } }