diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 0df25b36..6bccc563 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -123,7 +123,12 @@ public class PayWorkingGroupController extends JeroController queryList(PayWorkingGroup payWorkingGroup,HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroup, req.getParameterMap()); + Map parameterMap = req.getParameterMap(); + parameterMap.remove("column"); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroup, parameterMap); + queryWrapper.orderByAsc("CASE WHEN sort_no IS NULL THEN 1 ELSE 0 END"); + queryWrapper.orderByAsc("sort_no"); + queryWrapper.orderByDesc("create_time"); List list = payWorkingGroupService.list(queryWrapper); return Result.OK(list); }