From d538a62999e202ce4c5a10429402a82d95494755 Mon Sep 17 00:00:00 2001
From: zm <2369059705qq.com>
Date: 星期三, 04 九月 2024 17:16:37 +0800
Subject: [PATCH] 文件归档定时任务

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

diff --git a/src/main/java/com/product/file/service/DocumentService.java b/src/main/java/com/product/file/service/DocumentService.java
index 5649627..d3baa3a 100644
--- a/src/main/java/com/product/file/service/DocumentService.java
+++ b/src/main/java/com/product/file/service/DocumentService.java
@@ -337,13 +337,14 @@
 			String directory_uuid = fieldSetEntity.getString(CmnConst.DIRECTORY_UUID);
 			//String key = "%,140,%";
 			DataTableEntity dataTableEntity = new DataTableEntity();
-			FieldSetEntity org = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY_RIGHTS, "directory_uuid=?", new String[]{directory_uuid}, false);
+
+			FieldSetEntity org = recursionRole(directory_uuid);
 			if (verifyOrgExist(org.getString("storage_uuid"))) {
 				StringBuffer sql = new StringBuffer();
 				sql.append(" SELECT  substring_index(substring_index(a.rigths,',',b.help_topic_id+1),',',-1) fun FROM  PRODUCT_OA_directory_rights a ")
 						.append(" INNER join   mysql.help_topic b on b.help_topic_id < (length(a.rigths) - length(replace(a.rigths,',',''))+1) ")
 						.append(" WHERE a.directory_uuid = ? ");
-				dataTableEntity = baseDao.listTable(sql.toString(), new String[]{directory_uuid});
+				dataTableEntity = baseDao.listTable(sql.toString(), new String[]{org.getString("directory_uuid")});
 			}
 			StringBuffer button = new StringBuffer();
 			if (!BaseUtil.dataTableIsEmpty(dataTableEntity)) {
@@ -393,6 +394,21 @@
 		return fse;
 	}
 
+	/**
+	 * 閫掑綊鑾峰彇鏉冮檺濡傛灉褰撳墠鏂囨。鏈厤缃潈闄愬氨鍘婚�掑綊鏌ヨ鐖剁骇鏉冮檺
+	 * @param directory_uuid
+	 * @return
+	 */
+	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)){
+			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());
+		}
+		return org;
+	}
+
 	@Override
 	public JSONObject popBoxGetFileDirectory(FieldSetEntity fse) throws BaseException {
 		//鏂囦欢鐩綍uuid

--
Gitblit v1.9.2