From 47cb20a98153a31df7b50a4957ab6a2c6d3630dd Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 12 Apr 2024 21:02:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/userChange.vue |  6 +++---
 src/views/workSpace/index.vue | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/userChange.vue b/src/components/userChange.vue
index a0d8c3b5..97ae09ff 100644
--- a/src/components/userChange.vue
+++ b/src/components/userChange.vue
@@ -169,20 +169,20 @@ export default {
           this.selectProject(item);
         });
       } else {
-        if (!this.selectedProjectSn) {
+        if (!this.selectedProjectSn && !this.$store.state.projectSn) {
           // 加判断是为了在循环中只选中第一个
           this.selectedProjectSn = obj.sn;
-          this.setTreeActive();
           // 修改全局projectSn
           this.$store.commit("setProjectSn", obj.sn);
           this.$store.commit("setProDetail", obj);
         }
+        this.setTreeActive();
       }
     },
     // 设置树形的选中项目样式
     setTreeActive(){
       this.$nextTick(() => {
-        let activeSn = this.selectedProjectSn || this.$store.state.selectedGroupSn
+        let activeSn = this.selectedProjectSn || this.$store.state.projectSn
         if(activeSn){
           this.$refs.tree.setCurrentKey(activeSn);
         }
diff --git a/src/views/workSpace/index.vue b/src/views/workSpace/index.vue
index a2850f54..8ba69609 100644
--- a/src/views/workSpace/index.vue
+++ b/src/views/workSpace/index.vue
@@ -16,7 +16,7 @@
         frameborder="1"
       ></iframe>
     </div>
-    <div class="placeholderBox" v-else>
+    <div class="placeholderBox" v-if="!selectGroupDialog && !workSpaceShow">
       <img src="@/assets/images/noData.png" alt="" />
       <p>暂无数据</p>
     </div>
@@ -90,29 +90,30 @@ export default {
       getNewUserAllModulePageApi({
         projectSn: this.$store.state.projectSn,
         moduleType: 7,
-        userId: this.$store.state.userInfo.userId
+        userId: this.$store.state.userInfo.userId,
       }).then((res) => {
         // 传递的工作流菜单
         const responseMenuList = [];
         let all = res.result.moduleList;
-        if(all.length == 0) {
+        if (all.length == 0) {
           this.workSpaceShow = false;
           return;
         }
         console.log("all", res.result);
         all.forEach((element, index) => {
           all[index].operation = false;
-          res.result.menuList.forEach((element2) => {
-            if (element2.moduleId == element.moduleId) {
+          if (element.moduleName == "工作流") {
+            element.menuList.forEach((element2) => {
               all[index].operation = true;
               responseMenuList.push({
                 menuName: element2.menuName,
                 path: element2.path,
                 icon: element2.icon,
               });
-            }
-          });
+            });
+          }
         });
+        console.log(responseMenuList, "我的测试11112222222222");
         // 传递的工作流菜单
         const defaultMenuList = [
           {