代码提交

杜洪波

2024-06-18 160309ee65ffc6bd0dc5448ece27064e6cec4eb3

 src/main/java/com/product/administration/service/CustomerInfoService.java

@@ -43,6 +43,15 @@
//      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_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");
      if (!BaseUtil.strIsNull(searchFilter)) {
         sbSql.append("WHERE ").append(searchFilter);
      }
      
//      if(!StringUtils.isEmpty(dataFilter)) {
//         if (!StringUtils.isEmpty(searchFilter)) {
@@ -54,7 +63,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;
   }