Эх сурвалжийг харах

解决目录分享相关问题

wukai 1 жил өмнө
parent
commit
a2c6ad61c7

+ 6 - 3
doc-biz/src/main/java/com/doc/biz/controller/DocDirController.java

@@ -164,8 +164,6 @@ public class DocDirController extends BaseController {
      */
     private TreeVO getChildren(DocDir dir, String type, String st) {
         TreeVO vo = new TreeVO();
-
-
         vo.setId(dir.getDirId());
         vo.setLabel(dir.getDirName());
 
@@ -177,7 +175,12 @@ public class DocDirController extends BaseController {
         docDirService.addRole(dir1, type);
 
         docDirService.selectDocDirList(dir1).forEach(d -> {
-            children.add(getChildren(d, type, st));
+            String allowShare = "l0350";
+            //如果是分享的文件树
+            //判断是否允许分享
+            if (!fileTree.equals(st) || docDirService.hasRole(d.getDirId(), allowShare)) {
+                children.add(getChildren(d, type, st));
+            }
         });
 
         if (!dirTree.equals(st)) {