From 5e2771f2bef70f5f598b221509dd1ea9cc7e8191 Mon Sep 17 00:00:00 2001 From: 杜洪波 <1074825718@qq.com> Date: 星期二, 27 八月 2024 17:25:19 +0800 Subject: [PATCH] Merge branch 'master' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0 --- src/main/java/com/product/file/service/DocumentService.java | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java index a65f30e..fa8ad64 100644 --- a/src/main/java/com/product/file/service/DocumentService.java +++ b/src/main/java/com/product/file/service/DocumentService.java @@ -383,12 +383,12 @@ sql.append(" and tricode_parent = ? "); //鍔犺浇鏂囦欢璺緞 DataTableEntity dataTableEntity = documentDirectoryService.getDirectoryStructure(fse); - object.put("PRODUCT_OA_directory_path", BaseUtil.dataTableEntityToJson(dataTableEntity)); + object.put("product_oa_directory_path", BaseUtil.dataTableEntityToJson(dataTableEntity)); } //sql.append(" GROUP BY tricode,tricode_parent,directory_name"); DataTableEntity data = baseDao.listTable(sql.toString(), param.toArray()); - object.put("PRODUCT_OA_directory_sub", BaseUtil.dataTableEntityToJson(data)); + object.put("product_oa_directory_sub", BaseUtil.dataTableEntityToJson(data)); baseDao.listInternationDataTable(data, null); return object; @@ -566,19 +566,18 @@ DataTableEntity product_oa_document = new DataTableEntity(); StringBuilder sb=new StringBuilder(); + sb.append(" select d.*,f.show_name "); + sb.append(" from product_oa_document d "); + sb.append(" left join product_sys_staffs f "); + sb.append(" on d.created_by=f.user_id "); List<String> param=new ArrayList<>(); if(!ObjectUtil.isNotEmpty(fse.getString("document_name"))){ - - sb.append(" select d.*,f.show_name "); - sb.append(" from product_oa_document d "); - sb.append(" left join product_sys_staffs f "); - sb.append(" on d.created_by=f.user_id "); product_oa_document = baseDao.listTable(sb.toString(),param.toArray()); }else { String document_name = fse.getString("document_name"); sb.append(" where d.file_name like '%"+document_name+"%'"); - product_oa_document = baseDao.listTable(sb.toString()); + product_oa_document = baseDao.listTable(sb.toString(),param.toArray()); } -- Gitblit v1.9.2