From 66ee641ff68ab89432a30336f8b00d24606937cc Mon Sep 17 00:00:00 2001
From: 354798ggg <1074825718@qq.com>
Date: 星期三, 05 七月 2023 13:51:41 +0800
Subject: [PATCH] 客户台账高级搜索
---
src/main/java/com/product/administration/service/CustomerInfoService.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CustomerInfoService.java b/src/main/java/com/product/administration/service/CustomerInfoService.java
index be0dc83..881ca58 100644
--- a/src/main/java/com/product/administration/service/CustomerInfoService.java
+++ b/src/main/java/com/product/administration/service/CustomerInfoService.java
@@ -40,23 +40,21 @@
*/
public DataTableEntity listCustomerInfo(Integer cpage,Integer pageSize,FieldSetEntity fse) {
//鏁版嵁鏉冮檺
- /*
- String dataFilter=permissionService.getDataFilter(CmnConst.CREATED_BY) ;
+// String dataFilter=permissionService.getDataFilter(CmnConst.CREATED_BY) ;
//楂樼骇鏌ヨ
String searchFilter=queryFilterService.getQueryFilter(fse);
- if(!StringUtils.isEmpty(dataFilter)) {
- if (!StringUtils.isEmpty(searchFilter)) {
- dataFilter+=" AND "+ searchFilter;
- }
- }else {
- if (!StringUtils.isEmpty(searchFilter)) {
- dataFilter=searchFilter;
- }
- }
- */
+// if(!StringUtils.isEmpty(dataFilter)) {
+// if (!StringUtils.isEmpty(searchFilter)) {
+// dataFilter+=" AND "+ searchFilter;
+// }
+// }else {
+// if (!StringUtils.isEmpty(searchFilter)) {
+// dataFilter=searchFilter;
+// }
+// }
- DataTableEntity dt=baseDao.listTable(CmnConst.product_project_CUSTOMER, null, null, null, null, pageSize, cpage);
+ DataTableEntity dt=baseDao.listTable(CmnConst.product_project_CUSTOMER, searchFilter, null, null, null, pageSize, cpage);
baseDao.loadPromptData(dt);
return dt;
}
--
Gitblit v1.9.2