From cb20b5f9a33126705f2c3ab8fccbd42bcf15f206 Mon Sep 17 00:00:00 2001
From: 18756 <1875631620@qq.com>
Date: 星期五, 30 八月 2024 09:21:49 +0800
Subject: [PATCH] 文档功能优化8.30

---
 src/main/java/com/product/file/service/DocumentService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 37d16c9..5649627 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -709,13 +709,13 @@
 		StringBuilder sb = new StringBuilder();
 		List<String> param = new ArrayList<>();
 		sb.append(" SELECT b.* FROM (");
-		sb.append(" SELECT t.uuid,t.file_name,t.file_size,s.show_name,t.created_utc_datetime,count(t.uuid) as applyCount");
+		sb.append(" SELECT t.uuid,t.file_name,t.attachment_size as file_size,s.show_name,t.created_utc_datetime,count(t.uuid) as applyCount");
 		sb.append(" FROM product_oa_document_borrow_sub b");
-		sb.append(" JOIN product_oa_document t");
+		sb.append(" JOIN product_sys_attachments t");
 		sb.append(" on b.sub_uuid=t.uuid");
 		sb.append(" JOIN product_sys_staffs s ");
 		sb.append(" on t.created_by=s.user_id");
-		sb.append(" group by t.file_name,t.uuid,s.show_name,t.created_utc_datetime,t.file_size");
+		sb.append(" group by t.file_name,t.uuid,s.show_name,t.created_utc_datetime,t.attachment_size");
 		sb.append(" )b order by  b.applyCount asc");
 		DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), param.toArray());
 		return dataTableEntity;
@@ -740,7 +740,7 @@
 		sb.append(" FROM product_oa_document_borrow  w ");
 		sb.append(" left JOIN product_oa_document_borrow_sub b");
 		sb.append(" on b.borrow_uuid=w.uuid");
-		sb.append(" left JOIN product_oa_document t");
+		sb.append(" left JOIN product_sys_attachments t");
 		sb.append(" on b.sub_uuid=t.uuid");
 		sb.append(" left JOIN product_sys_staffs s");
 		sb.append(" on w.borrower=s.user_id");

--
Gitblit v1.9.2