From 0b960424d7b4b2e0b3970c69a39b08bef1d6a1eb Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Sat, 8 Oct 2022 10:55:01 +0800
Subject: [PATCH] bug

---
 .../impl/ExtRepoFolderServiceImpl.java        | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java
index 5575570fa..6c937dc85 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoFolderServiceImpl.java
@@ -271,10 +271,21 @@ public class ExtRepoFolderServiceImpl extends ServiceImpl<ExtRepoFolderMapper, E
         ExtRepoFolder father = queryById(folder);
         for (ExtRepoFolder extRepoFolder : listBySupFolder) {
             ERFTreeData date = new ERFTreeData(extRepoFolder.getFolderName(), extRepoFolder.getId(), childLevel, extRepoFolder.getOrderId());
-            date.setAuthManageIdsName(father.getAuthManageIdsName());
-            date.setAuthManageIds(father.getAuthManageIds());
-            date.setAuthViewIdsName(father.getAuthViewIdsName());
-            date.setAuthViewIds(father.getAuthViewIds());
+            //如果参数为空则延续父文件夹权限，反之用自己的
+            if (ObjectUtils.isNotEmpty(extRepoFolder.getAuthManageIds()) && ObjectUtils.isNotEmpty(extRepoFolder.getAuthManageIdsName())) {
+                date.setAuthManageIdsName(extRepoFolder.getAuthManageIdsName());
+                date.setAuthManageIds(extRepoFolder.getAuthManageIds());
+            } else {
+                date.setAuthManageIdsName(father.getAuthManageIdsName());
+                date.setAuthManageIds(father.getAuthManageIds());
+            }
+            if (ObjectUtils.isNotEmpty(extRepoFolder.getAuthViewIds()) && ObjectUtils.isNotEmpty(extRepoFolder.getAuthViewIdsName())) {
+                date.setAuthViewIdsName(extRepoFolder.getAuthViewIdsName());
+                date.setAuthViewIds(extRepoFolder.getAuthViewIds());
+            } else {
+                date.setAuthViewIdsName(father.getAuthViewIdsName());
+                date.setAuthViewIds(father.getAuthViewIds());
+            }
             date.setChildren(subFolderTree(extRepoFolder.getId(), new ArrayList<ERFTreeData>(),childLevel));
             date.sortChildren();
             childTree.add(date);