Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-adm...

shichongfu

2023-07-13 054625ce1c40468d0d052369d1de6e0edb8d7ce8

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

@@ -40,23 +40,21 @@
    */
   public DataTableEntity listCustomerInfo(Integer cpage,Integer pageSize,FieldSetEntity fse) {
      //数据权限
      /*
      String dataFilter=permissionService.getDataFilter(CmnConst.CREATED_BY) ;
//      String dataFilter=permissionService.getDataFilter(CmnConst.CREATED_BY) ;
      //高级查询
      String searchFilter=queryFilterService.getQueryFilter(fse);
      
      if(!StringUtils.isEmpty(dataFilter)) {
         if (!StringUtils.isEmpty(searchFilter)) {
            dataFilter+=" AND "+ searchFilter;
         }
      }else {
         if (!StringUtils.isEmpty(searchFilter)) {
            dataFilter=searchFilter;
         }
      }
      */
//      if(!StringUtils.isEmpty(dataFilter)) {
//         if (!StringUtils.isEmpty(searchFilter)) {
//            dataFilter+=" AND "+ searchFilter;
//         }
//      }else {
//         if (!StringUtils.isEmpty(searchFilter)) {
//            dataFilter=searchFilter;
//         }
//      }
        
      DataTableEntity dt=baseDao.listTable(CmnConst.product_project_CUSTOMER, null, null, null, null, pageSize, cpage);
      DataTableEntity dt=baseDao.listTable(CmnConst.product_project_CUSTOMER, searchFilter, null, null, null, pageSize, cpage);
      baseDao.loadPromptData(dt);
      return dt;
   }
@@ -217,6 +215,7 @@
    */
   @Transactional
   public boolean deleteCustomerInfo(String uuid) throws BaseException{
      return baseDao.delete(CmnConst.product_project_CUSTOMER, "uuid=?", new Object[] {uuid});
      String[] uuids = uuid.split(",");
        return baseDao.delete(CmnConst.product_project_CUSTOMER, BaseUtil.buildQuestionMarkFilter(CmnConst.UUID, uuids.length, true), uuids);
   }
}