From 7a8f156d1c0a430b3dbecace691706f40589534e Mon Sep 17 00:00:00 2001
From: zhengzhou <zhengzhou@hotmail.com>
Date: Thu, 15 Apr 2021 16:27:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=8A=82=E7=82=B9=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=8E=A5=E5=8F=A3=E5=8E=BB=E6=8E=89=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E7=9A=84=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main_web/workspace/components/archive-view/index.vue      | 2 +-
 .../main_web/workspace/components/file-explorer/index.vue     | 4 ++--
 src/views/main_web/workspace/index.vue                        | 3 ---
 src/views/main_web/workspace/service.js                       | 4 ++--
 src/views/main_web/workspace/workspace.new.vue                | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/views/main_web/workspace/components/archive-view/index.vue b/src/views/main_web/workspace/components/archive-view/index.vue
index e7261586..edea450e 100644
--- a/src/views/main_web/workspace/components/archive-view/index.vue
+++ b/src/views/main_web/workspace/components/archive-view/index.vue
@@ -301,7 +301,7 @@ export default {
       const folderResInfo = await services.fetchFolderFileList(
         nodeFolder.id,
         userId,
-        nodeFolder.id
+        // nodeFolder.id
       );
 
       if (!folderResInfo) return;
diff --git a/src/views/main_web/workspace/components/file-explorer/index.vue b/src/views/main_web/workspace/components/file-explorer/index.vue
index bad60a32..07cd9e27 100644
--- a/src/views/main_web/workspace/components/file-explorer/index.vue
+++ b/src/views/main_web/workspace/components/file-explorer/index.vue
@@ -674,7 +674,7 @@ export default {
     searchContent: String,
     nodeFolders: Array,
     currentNodeFolder: Object,
-    publicFolder: Object,
+    // publicFolder: Object,
   },
   data() {
     return {
@@ -1820,7 +1820,7 @@ export default {
       const folderResInfo = await services.fetchFolderFileList(
         nodeFolder.id,
         userId,
-        this.publicFolder.id
+        // this.publicFolder.id
       );
       if (!folderResInfo) return;
       // 快速切换节点的时候
diff --git a/src/views/main_web/workspace/index.vue b/src/views/main_web/workspace/index.vue
index 812e8660..873537e8 100644
--- a/src/views/main_web/workspace/index.vue
+++ b/src/views/main_web/workspace/index.vue
@@ -50,7 +50,6 @@
         :currentNodeFolder="currentNodeFolder"
         :searchContent="searchKeywords"
         :nodeFolders="nodeFolders"
-        :publicFolder="publicFolder"
         @showAchieveView="viewType = 'archive-view'"
       />
       <archive-view
@@ -84,7 +83,6 @@ export default {
       projectName: sessionStorage.projName, // 当前项目名称
       nodeFolders: [], // 节点文件夹
       currentNodeFolder: null, // 当前节点文件夹
-      publicFolder: null,
       // currentFolder: {}, // 当前文件夹，可以是节点文件夹，可以是子文件夹
       workFlowVisible: false, // 工作链页面显示开关
       viewType: 'file-explorer', // computed: file-explorer || archive-view
@@ -140,7 +138,6 @@ export default {
           folder.nodeId !== folder.templateId
           // && folder.folderName !== "公共文件夹"
       );
-      this.publicFolder = folderList.find(folder => folder.isPublic);
       this.nodeFolders = folderList;
       this.folderMap = folderList.reduce((h, f) => ((h[f.id] = f), h), {});
       if (!folderList.length) return;
diff --git a/src/views/main_web/workspace/service.js b/src/views/main_web/workspace/service.js
index a6c862eb..1fa06c5b 100644
--- a/src/views/main_web/workspace/service.js
+++ b/src/views/main_web/workspace/service.js
@@ -45,8 +45,8 @@ export async function removeFromRecycleBin(id){
  * @param {*} folderId 
  * @param {*} userId 
  */
-export async function fetchFolderFileList(folderId, userId, commonFolderId) {
-  const res = await fetchApi('folder/queryFileListByFolderIdAndUserId', { folderId, userId, publicFolderId: commonFolderId });
+export async function fetchFolderFileList(folderId, userId) {
+  const res = await fetchApi('folder/queryFileListByFolderIdAndUserId', { folderId, userId });
   wrapErrorHint(res);
   if (res.Code !== 0) return null;
   const data = res.Data || {};
diff --git a/src/views/main_web/workspace/workspace.new.vue b/src/views/main_web/workspace/workspace.new.vue
index 68aeeb38..c7d0c7cb 100644
--- a/src/views/main_web/workspace/workspace.new.vue
+++ b/src/views/main_web/workspace/workspace.new.vue
@@ -1504,7 +1504,7 @@ export default {
       // this.workSubFolderList = [];
       // this.cooperationFileList = [];
       // todo 接口去除公共文件夹配置
-      const folderResInfo = await services.fetchFolderFileList(nodeFolder.id, userId, nodeFolder.id);
+      const folderResInfo = await services.fetchFolderFileList(nodeFolder.id, userId);
       if(!folderResInfo) return;
       // 快速切换节点的时候
       if(this.currentNodeFolder.id !== nodeFolder.id) return;