From 1d1d34b48e6e80bea350d805d8ff2564ca226f25 Mon Sep 17 00:00:00 2001 From: 杜洪波 <1074825718@qq.com> Date: 星期一, 19 八月 2024 13:44:17 +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 | 6 ++++-- 1 files changed, 4 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 480c465..638814f 100644 --- a/src/main/java/com/product/administration/service/CustomerInfoService.java +++ b/src/main/java/com/product/administration/service/CustomerInfoService.java @@ -8,7 +8,6 @@ import com.product.administration.config.CmnConst; import com.product.administration.service.ide.ICustomerInfoService; -import com.product.common.lang.StringUtils; import com.product.core.dao.BaseDao; import com.product.core.entity.DataTableEntity; import com.product.core.entity.FieldSetEntity; @@ -49,7 +48,10 @@ 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 (!BaseUtil.strIsNull(searchFilter)) { + sbSql.append("WHERE ").append(searchFilter); + } + // if(!StringUtils.isEmpty(dataFilter)) { // if (!StringUtils.isEmpty(searchFilter)) { // dataFilter+=" AND "+ searchFilter; -- Gitblit v1.9.2