fix: 工作台处理

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml

@@ -153,19 +153,36 @@
                                     #{value}
                                 </foreach>
                             </when>
-                            <otherwise>
+                            <when test="key=='status'">
-                                and test_plan.status in
+                                <choose>
-                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    <when test="request.executorOrPrincipal != null">
-                                    #{value}
+                                        AND (( test_plan_principal.principal_id  = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' and
-                                </foreach>
+                                                test_plan.status in
-                            </otherwise>
+                                                <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">

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>

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 98932507cfbeb7b1529c41360898cdf0947e7252
+Subproject commit b50fa6030ea19d01985aabed1e7d9d804737ad59

frontend/src/i18n/zh-CN.js

@@ -342,7 +342,7 @@ export default {
   workstation:{
     dash_board: '我的仪表盘',
     upcoming: '我的待办',
-    focus: '我关注的',
+    focus: '我的关注',
     creation: '我创建的',
     table_name:{
       track_case:'功能用例',

frontend/src/i18n/zh-TW.js

@@ -342,7 +342,7 @@ export default {
   workstation:{
     dash_board: '我的儀錶盤',
     upcoming: '我的待辦',
-    focus: '我關注的',
+    focus: '我的關注',
     creation: '我創建的',
     table_name:{
       track_case:'功能用例',