杜洪波
2024-08-19 1d1d34b48e6e80bea350d805d8ff2564ca226f25
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;
@@ -45,11 +44,14 @@
      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");
      sbSql.append(searchFilter);
      if (!BaseUtil.strIsNull(searchFilter)) {
         sbSql.append("WHERE ").append(searchFilter);
      }
//      if(!StringUtils.isEmpty(dataFilter)) {
//         if (!StringUtils.isEmpty(searchFilter)) {
//            dataFilter+=" AND "+ searchFilter;