From 6b7cae03993b441711d385183a2d37060e24a669 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 11 Sep 2024 17:10:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D=E6=97=B6=EF=BC=8C=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84=E6=8C=89=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/project/controller/PayWorkingGroupController.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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<PayWorkingGroup, I
 	@ApiOperation(value="工作组项目-列表查询", notes="工作组项目-列表查询")
 	@GetMapping(value = "/listAll")
 	public Result<?> queryList(PayWorkingGroup payWorkingGroup,HttpServletRequest req) {
-		QueryWrapper<PayWorkingGroup> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroup, req.getParameterMap());
+		Map<String, String[]> parameterMap = req.getParameterMap();
+		parameterMap.remove("column");
+		QueryWrapper<PayWorkingGroup> 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<PayWorkingGroup> list = payWorkingGroupService.list(queryWrapper);
 		return Result.OK(list);
 	}