From b152a8c7e67c17d4561fb301d2e10ff5c1f76e15 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期一, 19 八月 2024 13:43:58 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/administration/service/CustomerInfoService.java | 2 +-
src/main/java/com/product/administration/service/EarlyWarningServer.java | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/product/administration/service/CustomerInfoService.java b/src/main/java/com/product/administration/service/CustomerInfoService.java
index 3f742ff..480c465 100644
--- a/src/main/java/com/product/administration/service/CustomerInfoService.java
+++ b/src/main/java/com/product/administration/service/CustomerInfoService.java
@@ -45,7 +45,7 @@
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(" A.uuid,A.customer_name, 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");
diff --git a/src/main/java/com/product/administration/service/EarlyWarningServer.java b/src/main/java/com/product/administration/service/EarlyWarningServer.java
index ccb9864..8061dfe 100644
--- a/src/main/java/com/product/administration/service/EarlyWarningServer.java
+++ b/src/main/java/com/product/administration/service/EarlyWarningServer.java
@@ -258,6 +258,7 @@
while (s >= 0) {
int c = warnContent.indexOf("{#", s);
if (c == -1) {
+ concatField.append(" uuid ");
break;
}
int m = warnContent.indexOf("#}", c);
--
Gitblit v1.9.2