From d8ba5dda56e0065874e9ed707e875732b3af7995 Mon Sep 17 00:00:00 2001 From: 许鹏程 <1821349743@qq.com> Date: 星期二, 23 五月 2023 15:28:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java b/home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java index 9c19a98..23f8347 100644 --- a/home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java +++ b/home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java @@ -77,7 +77,7 @@ if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){ filter = filter + " and " + queryFilterService.getQueryFilter(fs); } - DataTableEntity dt = baseDao.listTable(CmnConst.APP_GZRYCCSPB,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE)); + DataTableEntity dt = baseDao.listTable(CmnConst.APP_GZRYCCSPB,filter,null,null," ag00 desc ",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE)); baseDao.loadPromptData(dt); return dt; } -- Gitblit v1.9.2