Merge branch 'dev' of http://47.104.91.134:3000/yiyun-fe/yiyunjianzhu-vue into dev

src/views/components_web/distWork/distWork.vue

@@ -1461,6 +1461,7 @@ export default {
       }
       const folderList = mergeFolderList(folder, userHash);
       this.listNewFolder = folderList;
+      console.log('得到的listNewFolder', this.listNewFolder);
     },
     async getUserList(){
       const { list: userList } = await getUserListByNode({ id: this.$store.state.currentCompanyId, nodeType: 'company' }, 1, 10000);
@@ -1531,8 +1532,13 @@ export default {
               OldGeneralId:''
           };
             workNode.FolderId = folder.id;
-            workNode.ManagerUserId = folder.manageUser.length > 0 ? folder.manageUser.map(manager => { return manager.id }).join(',') : '';
-            workNode.GeneralId = folder.listUser.length > 0 ? folder.listUser.map(user => { return user.id }).join(',') : '';
+            let tempManagerIdList = [];
+            workNode.ManagerUserId = folder.manageUser.length > 0 ? folder.manageUser.map(manager => {
+              tempManagerIdList.push(manager.id);
+               return manager.id;
+            }).join(',') : '';
+            let tempListUser = folder.listUser.filter(item => !tempManagerIdList.includes(item.id));
+            workNode.GeneralId = folder.listUser.length > 0 ? tempListUser.map(user => { return user.id }).join(',') : '';
             workNode.OldManager = folder.oldManager;
             workNode.OldGeneralId = folder.oldGeneralId;
             console.log(workNode);
@@ -1554,10 +1560,7 @@ export default {
               offset: 100,
               duration: 2500
             });
-            setTimeout(() => {
-              thisApp.offDialog();
-            }, 2000)
-            
+        thisApp.offDialog();
       } else {
          thisApp.$notify.error({
               title: "温馨提示",