From d3cbcd265d0ee70eca677972403afcff1a0fc990 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期四, 18 五月 2023 09:37:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
home-server-admin/src/main/java/com/home/xining/service/TravelTrainingService.java | 3 +++
1 files changed, 3 insertions(+), 0 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..9c19a98 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,6 +74,9 @@
// filter += " and "+dataFilter;
// }
// }
+ 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));
baseDao.loadPromptData(dt);
return dt;
--
Gitblit v1.9.2