From fd0c7c174d7b7313aa49061df05350405a3c1bf1 Mon Sep 17 00:00:00 2001 From: 354798ggg <1074825718@qq.com> Date: 星期二, 29 八月 2023 15:56:11 +0800 Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg --- home-server-admin/src/main/java/com/home/xining/service/CivilServantReceptionService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/home-server-admin/src/main/java/com/home/xining/service/CivilServantReceptionService.java b/home-server-admin/src/main/java/com/home/xining/service/CivilServantReceptionService.java index 50ca9d0..54be44e 100644 --- a/home-server-admin/src/main/java/com/home/xining/service/CivilServantReceptionService.java +++ b/home-server-admin/src/main/java/com/home/xining/service/CivilServantReceptionService.java @@ -81,7 +81,7 @@ if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){ filter = filter + " and " + queryFilterService.getQueryFilter(fs); } - DataTableEntity dt = baseDao.listTable(CmnConst.GWJDSPB,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE)); + DataTableEntity dt = baseDao.listTable(CmnConst.GWJDSPB,filter,null,null," gw00 desc ",fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE)); baseDao.loadPromptData(dt); return dt; } -- Gitblit v1.9.2