From 7f230f4a07f67e81ab49e81c4154b3586e2c79ec Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期四, 06 六月 2024 13:50:54 +0800
Subject: [PATCH] 代码提交

---
 src/main/java/com/product/administration/service/CustomerInfoService.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/product/administration/service/CustomerInfoService.java b/src/main/java/com/product/administration/service/CustomerInfoService.java
index 6895dd1..3f742ff 100644
--- a/src/main/java/com/product/administration/service/CustomerInfoService.java
+++ b/src/main/java/com/product/administration/service/CustomerInfoService.java
@@ -43,7 +43,13 @@
 //		String dataFilter=permissionService.getDataFilter(CmnConst.CREATED_BY) ;
 		//楂樼骇鏌ヨ
 		String searchFilter=queryFilterService.getQueryFilter(fse);
-		
+		StringBuilder sbSql = new StringBuilder();
+		sbSql.append("SELECT \n");
+		sbSql.append("	A.uuid, A.customer_manager, A.customer_manager_leader,A.business_agent, \n");
+		sbSql.append("	CONCAT(B.linkman, '-', B.mobile) AS customer_contact \n");
+		sbSql.append("FROM product_project_customer A \n");
+		sbSql.append("LEFT JOIN product_project_customer_sub B ON B.customer_uuid = A.uuid \n");
+		sbSql.append(searchFilter);
 //		if(!StringUtils.isEmpty(dataFilter)) {
 //			if (!StringUtils.isEmpty(searchFilter)) {
 //				dataFilter+=" AND "+ searchFilter;
@@ -54,7 +60,8 @@
 //			}
 //		}
         
-		DataTableEntity dt=baseDao.listTable(CmnConst.product_project_CUSTOMER, searchFilter, null, null, null, pageSize, cpage);
+//		DataTableEntity dt=baseDao.listTable(CmnConst.product_project_CUSTOMER, searchFilter, null, null, null, pageSize, cpage);
+		DataTableEntity dt = baseDao.listTable(sbSql.toString(), new Object[] {}, pageSize, cpage);
 		baseDao.loadPromptData(dt);
 		return dt;
 	}

--
Gitblit v1.9.2