From 7582a36005ab112a80815454985f2bb9ffe17934 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 16 八月 2023 11:56:58 +0800
Subject: [PATCH] xn commit
---
home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java | 5 ++++-
1 files changed, 4 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 ffdf4e6..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
@@ -74,7 +74,10 @@
// filter += " and "+dataFilter;
// }
// }
- DataTableEntity dt = baseDao.listTable(CmnConst.APP_GZRYCCSPB,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ if(!BaseUtil.dataTableIsEmpty(fs.getSubDataTable("systemSeniorQueryString"))){
+ filter = filter + " and " + queryFilterService.getQueryFilter(fs);
+ }
+ 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