From 77d0ccffe8922b936b7fb917b7f2aebc24871bad Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期一, 26 八月 2024 16:18:11 +0800
Subject: [PATCH] 文档功能优化8.26-2
---
src/main/java/com/product/file/service/DocumentService.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 4c81669..d10298b 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -85,9 +85,9 @@
//鍒涘缓鏂囨。鐗堟湰鏁版嵁瀹瑰櫒
FieldSetEntity fseDocumentHistory = new FieldSetEntity(CmnConst.PRODUCT_OA_DOCUMENT_HISTORY);
BaseUtil.createCreatorAndCreationTime(fseDocumentHistory);
- fseDocument.setValue("document_uuid", documentUUID);
- fseDocument.setValue("attachment_uuid", attachment.getUUID());
- fseDocument.setValue("version_number", "v1");
+ fseDocumentHistory.setValue("document_uuid", documentUUID);
+ fseDocumentHistory.setValue("attachment_uuid", attachment.getUUID());
+ fseDocumentHistory.setValue("version_number", "v1");
baseDao.add(fseDocumentHistory);
uuidList.add(documentUUID);
@@ -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