From 054625ce1c40468d0d052369d1de6e0edb8d7ce8 Mon Sep 17 00:00:00 2001
From: shichongfu <shi_chongfu@163.com>
Date: 星期四, 13 七月 2023 17:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-administration/V2.0.0
---
src/main/java/com/product/administration/service/CustomerInfoService.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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..6895dd1 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;
}
@@ -217,6 +215,7 @@
*/
@Transactional
public boolean deleteCustomerInfo(String uuid) throws BaseException{
- return baseDao.delete(CmnConst.product_project_CUSTOMER, "uuid=?", new Object[] {uuid});
+ String[] uuids = uuid.split(",");
+ return baseDao.delete(CmnConst.product_project_CUSTOMER, BaseUtil.buildQuestionMarkFilter(CmnConst.UUID, uuids.length, true), uuids);
}
}
--
Gitblit v1.9.2