From d64e7af39538a31b8a947113631c6ed2028d181f Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期一, 13 十月 2025 16:45:12 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0 into dev
---
src/main/java/com/product/administration/service/DriverInfoService.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/administration/service/DriverInfoService.java b/src/main/java/com/product/administration/service/DriverInfoService.java
index 042c792..3cd7ddf 100644
--- a/src/main/java/com/product/administration/service/DriverInfoService.java
+++ b/src/main/java/com/product/administration/service/DriverInfoService.java
@@ -8,6 +8,7 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.core.service.support.AbstractBaseService;
+import com.product.core.service.support.QueryFilterService;
import com.product.core.spring.context.SpringMVCContextHolder;
import com.product.core.transfer.Transactional;
import com.product.util.BaseUtil;
@@ -30,6 +31,9 @@
public class DriverInfoService extends AbstractBaseService implements IDriverInfoService {
@Autowired
public BaseDao baseDao;
+
+ @Autowired
+ QueryFilterService queryFilterService;
/**
* @description: 淇濆瓨鍙告満淇℃伅
@@ -69,7 +73,8 @@
* @date: 2021-04-27 16:15
*/
public DataTableEntity Driverlist(FieldSetEntity fs) {
- DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_CAR_DRIVER_INFO,null,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
+ String filter = queryFilterService.getQueryFilter(fs);
+ DataTableEntity dt = baseDao.listTable(CmnConst.PRODUCT_OA_CAR_DRIVER_INFO,filter,null,null,null,fs.getInteger(CmnConst.PAGESIZE),fs.getInteger(CmnConst.CPAGE));
baseDao.loadPromptData(dt);
return dt;
}
--
Gitblit v1.9.2