From c44197f90840de38632964357ef63cd54610375d Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 28 Oct 2021 14:45:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestPlanMapper.xml     | 35 ++++++++++++++-----
 .../components/common/head/HeaderTopMenus.vue |  2 +-
 frontend/src/business/components/xpack        |  2 +-
 frontend/src/i18n/zh-CN.js                    |  2 +-
 frontend/src/i18n/zh-TW.js                    |  2 +-
 5 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
index 1b16544f68..aee04e111f 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
@@ -153,19 +153,36 @@
                                     #{value}
                                 </foreach>
                             </when>
-                            <otherwise>
-                                and test_plan.status in
-                                <foreach collection="values" item="value" separator="," open="(" close=")">
-                                    #{value}
-                                </foreach>
-                            </otherwise>
+                            <when test="key=='status'">
+                                <choose>
+                                    <when test="request.executorOrPrincipal != null">
+                                        AND (( test_plan_principal.principal_id  = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' and
+                                                test_plan.status in
+                                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                                    #{value}
+                                                </foreach>
+                                               )
+                                               or
+                                                (test_plan_test_case.executor = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' and
+                                                    test_plan_test_case.status in
+                                                    <foreach collection="values" item="value" separator="," open="(" close=")">
+                                                        #{value}
+                                                    </foreach>
+                                                ))
+                                    </when>
+                                    <otherwise >
+                                        and test_plan.status in
+                                        <foreach collection="values" item="value" separator="," open="(" close=")">
+                                            #{value}
+                                        </foreach>
+                                    </otherwise>
+                                </choose>
+                            </when>
                         </choose>
                     </if>
                 </foreach>
             </if>
-            <if test="request.executorOrPrincipal != null">
-                AND ( test_plan.creator = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' or  test_plan_principal.principal_id  = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' or  test_plan_test_case.executor = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}')
-            </if>
+
         </where>
 
         <if test="request.orders != null and request.orders.size() > 0">
diff --git a/frontend/src/business/components/common/head/HeaderTopMenus.vue b/frontend/src/business/components/common/head/HeaderTopMenus.vue
index 7db9c9ac4d..b78e5aac51 100644
--- a/frontend/src/business/components/common/head/HeaderTopMenus.vue
+++ b/frontend/src/business/components/common/head/HeaderTopMenus.vue
@@ -8,7 +8,7 @@
            @select="handleSelect"
            :key="menuKey"
            router>
-    <el-menu-item index="/workstation"   onselectstart="return false"
+    <el-menu-item index="/workstation"  v-xpack onselectstart="return false"
                   v-permission="['PROJECT_API_DEFINITION:READ','PROJECT_API_SCENARIO:READ','PROJECT_API_REPORT:READ']">
       {{ $t('commons.my_workstation') }}
     </el-menu-item>
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 98932507cf..b50fa6030e 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 98932507cfbeb7b1529c41360898cdf0947e7252
+Subproject commit b50fa6030ea19d01985aabed1e7d9d804737ad59
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 664aa869c5..17a616049b 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -342,7 +342,7 @@ export default {
   workstation:{
     dash_board: '我的仪表盘',
     upcoming: '我的待办',
-    focus: '我关注的',
+    focus: '我的关注',
     creation: '我创建的',
     table_name:{
       track_case:'功能用例',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 9b565aabc7..5acab1f984 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -342,7 +342,7 @@ export default {
   workstation:{
     dash_board: '我的儀錶盤',
     upcoming: '我的待辦',
-    focus: '我關注的',
+    focus: '我的關注',
     creation: '我創建的',
     table_name:{
       track_case:'功能用例',