From a4d27567652c7cd81eeb0d4628cc55ffb07f8167 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 17 九月 2025 09:29:01 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/file/service/DocumentService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index e40fe09..435cf4a 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -404,7 +404,7 @@
*/
private FieldSetEntity recursionRole(String directory_uuid){
FieldSetEntity org = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY_RIGHTS, "directory_uuid=?", new String[]{directory_uuid}, false);
- if (FieldSetEntity.isEmpty(org)){
+ if (FieldSetEntity.isEmpty(org)&&!StringUtils.isEmpty(directory_uuid)){
FieldSetEntity directoryFs = baseDao.getFieldSet(CmnConst.PRODUCT_OA_DIRECTORY, directory_uuid,false);
FieldSetEntity parentFs = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY, "tricode=?",new String[]{directoryFs.getString("tricode_parent")},false);
org=recursionRole(parentFs.getUUID());
@@ -735,7 +735,7 @@
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.attachment_size");
- sb.append(" )b order by b.applyCount asc");
+ sb.append(" )b order by b.applyCount DESC");
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), param.toArray());
return dataTableEntity;
}
@@ -766,7 +766,7 @@
sb.append(" GROUP BY w.borrower,s.show_name");
sb.append(" )a )b");
sb.append(" on a.borrower=b.borrower ");
- sb.append(" order by a.applayCount,b.applayFileCount asc");
+ sb.append(" order by a.applayCount,b.applayFileCount DESC");
DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), param.toArray());
return dataTableEntity;
}
@@ -832,8 +832,13 @@
return permission;
}
public DataTableEntity getFileItemize(FieldSetEntity fes) throws BaseException {
- DataTableEntity dt = baseDao.listTable("SELECT b.classify_name,COUNT(1) number FROM product_oa_document a LEFT JOIN product_oa_document_classify_config b on a.business_classify_uuid=b.uuid\n" +
- "where classify_name is not null GROUP BY b.classify_name ORDER BY COUNT(1)",new String[]{});
+ StringBuilder sbSql = new StringBuilder();
+ sbSql.append("\n SELECT b.classify_name,COUNT(1) AS number");
+ sbSql.append("\n FROM product_oa_document a");
+ sbSql.append("\n LEFT JOIN product_oa_document_classify_config b ON a.business_classify_uuid = b.uuid");
+ sbSql.append("\n WHERE classify_name IS NOT NULL ");
+ sbSql.append("\n GROUP BY b.classify_name ORDER BY COUNT(1)");
+ DataTableEntity dt = baseDao.listTable(sbSql.toString(),new String[]{});
for (int i = 0; i <dt.getRows() ; i++) {
dt.setFieldValue(i,"ranking",i+1);
}
--
Gitblit v1.9.2