diff --git a/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml
index ff4ff9f7d0..e86c133de5 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/UiScenarioReferenceMapper.xml
@@ -249,13 +249,13 @@
     WHERE usf.reference_id = #{request.scenarioId}
       AND usf.reference_type = "REF"
       AND us.scenario_type = #{request.scenarioType}
-    <if test="request.workspace != null">
+    <if test="request.workspace != null and request.workspace.size() > 0">
       AND w.id in
       <foreach close=")" collection="request.workspace" item="listItem" open="(" separator=",">
         #{listItem}
       </foreach>
     </if>
-    <if test="request.project != null">
+    <if test="request.project != null and request.project.size() > 0">
       AND p.id in
       <foreach close=")" collection="request.project" item="listItem" open="(" separator=",">
         #{listItem}
@@ -285,13 +285,13 @@
 
     WHERE
      us.ui_scenario_id = #{request.scenarioId}
-        <if test="request.workspace != null">
+        <if test="request.workspace != null and request.workspace.size() > 0">
           AND w.id in
           <foreach close=")" collection="request.workspace" item="listItem" open="(" separator=",">
             #{listItem}
           </foreach>
         </if>
-        <if test="request.project != null">
+        <if test="request.project != null  and request.project.size() > 0">
           AND p.id in
           <foreach close=")" collection="request.project" item="listItem" open="(" separator=",">
             #{listItem}
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 4797ac156b..f66e0f6c3e 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -239,7 +239,9 @@ task_notification=Result notification
 message_task_already_exists=Task recipient already exists
 #automation
 automation_name_already_exists=the scenario already exists in the module of the same project
+automation_command_name_already_exists=the command already exists in the module of the same project
 automation_name=Scenario
+command_name=Command
 automation_exec_info=There are no test steps to execute
 delete_check_reference_by=be referenced by Scenario 
 not_execute=Not execute
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 2ba22e6bcf..747d18b949 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -239,7 +239,9 @@ task_notification=任务通知
 message_task_already_exists=任务接收人已经存在
 #automation
 automation_name_already_exists=同一个项目的同一模块下，场景名称不能重复
+automation_command_name_already_exists=同一个项目的同一模块下，指令名称不能重复
 automation_name=场景
+command_name=指令
 automation_exec_info=没有测试步骤，无法执行
 delete_check_reference_by=被场景引用
 not_execute=未执行
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index eed4e92579..44e8fd33fb 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -238,7 +238,9 @@ task_notification=任務通知
 message_task_already_exists=任務接收人已經存在
 #automation
 automation_name_already_exists=同一個項目同一模塊下，場景名稱不能重復
+automation_command_name_already_exists=同一個項目同一模塊下，指令名稱不能重復
 automation_name=場景
+command_name=指令
 automation_exec_info=沒有測試步驟，無法執行
 delete_check_reference_by=被場景引用
 not_execute=未執行
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 80cf85c741..a93dfd4ffc 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 80cf85c741f08c6e448ed051dea30aa193e01988
+Subproject commit a93dfd4ffcde2e8344d38bd218b63c9a76e989d5
diff --git a/frontend/src/common/js/default-table-header.js b/frontend/src/common/js/default-table-header.js
index 3f0f3c4443..39320e2031 100644
--- a/frontend/src/common/js/default-table-header.js
+++ b/frontend/src/common/js/default-table-header.js
@@ -97,6 +97,17 @@ export let CUSTOM_TABLE_HEADER = {
     {id: 'passRate', key: 'b', label: 'api_test.automation.passing_rate'},
     {id: 'createTime', key: 'c', label: 'commons.create_time'},
   ],
+  //自定义指令
+  UI_CUSTOM_COMMAND: [
+    {id: 'num', key: '1', label: "ID"},
+    {id: 'name', key: '2', label: 'ui.command_name_label'},
+    {id: 'tags', key: '5', label: 'commons.tag'},
+    {id: 'creatorName', key: 'd', label: 'api_test.automation.creator'},
+    {id: 'principalName', key: '6', label: 'api_test.definition.api_principal'},
+    {id: 'updateTime', key: '7', label: 'api_test.definition.api_last_time'},
+    {id: 'lastResult', key: 'a', label: 'ui.debug_result_label'},
+    {id: 'createTime', key: 'c', label: 'commons.create_time'},
+  ],
   //用例评审
   TEST_CASE_REVIEW: [
     {id: 'name', key: '1', label: 'test_track.review.review_name'},
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index f4977b2cc0..bcd9224dc5 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -2976,6 +2976,7 @@ export default {
     test_plan_ref_label: "Test plan reference",
     delete_scenario_lable: "Delete scenario",
     delete_command_lable: "Delete command",
+    command_name_label: "Command name",
   },
   project_application: {
     workstation: {
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index e85ec5c8ec..52f7f3dd43 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2986,6 +2986,7 @@ export default {
     test_plan_ref_label: "测试计划引用",
     delete_scenario_lable: "删除场景",
     delete_command_lable: "删除指令",
+    command_name_label: "指令名称",
   },
   project_application: {
     workstation: {
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 6a5343b751..c187287903 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2965,6 +2965,7 @@ export default {
     test_plan_ref_label: "測試計劃引用",
     delete_scenario_lable: "刪除場景",
     delete_command_lable: "刪除指令",
+    command_name_label: "指令名稱",
   },
   project_application: {
     workstation: {