From df91d64c7ed78205084828ff5bf018d876970b46 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 13 三月 2026 10:08:06 +0800
Subject: [PATCH] Merge branch 'dev' of http://nonxin.cn:8090/r/product/product-server-file/V2.0.0 into dev
---
src/main/java/com/product/file/service/DocumentService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 0c118fc..64081ff 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -86,7 +86,7 @@
BaseUtil.createCreatorAndCreationTime(fseDocumentHistory);
fseDocumentHistory.setValue("document_uuid", documentUUID);
fseDocumentHistory.setValue("attachment_uuid", attachment.getUUID());
- fseDocumentHistory.setValue("version_number", "v1");
+ fseDocumentHistory.setValue("version_number", "1");
baseDao.add(fseDocumentHistory);
uuidList.add(documentUUID);
@@ -396,9 +396,11 @@
private DataTableEntity recursionRole(String directory_uuid){
DataTableEntity dtOperationPermissions = baseDao.listTable(CmnConst.PRODUCT_OA_DIRECTORY_RIGHTS, "directory_uuid = ?", new Object[] {directory_uuid});
if (BaseUtil.dataTableIsEmpty(dtOperationPermissions)) {
- FieldSetEntity fseDirectory = baseDao.getFieldSet(CmnConst.PRODUCT_OA_DIRECTORY, directory_uuid,false);
+ FieldSetEntity fseDirectory = baseDao.getFieldSet(CmnConst.PRODUCT_OA_DIRECTORY, directory_uuid, false);
FieldSetEntity fseDirectoryParent = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY, "tricode=?",new String[]{fseDirectory.getString("tricode_parent")},false);
- dtOperationPermissions = recursionRole(fseDirectoryParent.getUUID());
+ if (!fseDirectoryParent.isEmpty()) {
+ dtOperationPermissions = recursionRole(fseDirectoryParent.getUUID());
+ }
}
return dtOperationPermissions;
}
--
Gitblit v1.9.2