diff --git a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
index 0f7c63cabe..21b13bb180 100644
--- a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
+++ b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
@@ -11,6 +11,7 @@
 
 <script>
 import {getCurrentWorkspaceId} from "@/common/js/utils";
+import {LOCAL} from "@/common/js/constants";
 
 export default {
   name: "TemplateSelect",
@@ -59,7 +60,7 @@ export default {
                 break;
               }
             } else {
-              if (item.system && item.platform === 'metersphere' && item.name === 'default') {
+              if (item.system && item.platform === LOCAL && item.name === 'default') {
                 this.$set(this.data, this.prop, item.id);
                 break;
               }
diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js
index bdff9ad3cd..7da402b5a7 100644
--- a/frontend/src/business/components/track/common/minder/minderUtils.js
+++ b/frontend/src/business/components/track/common/minder/minderUtils.js
@@ -544,9 +544,10 @@ export function handleMinderIssueDelete(commandName, isPlan) {
           isAllIssue = false;
         }
       });
-      Promise.all(promises).then(() => {
-        success(i18n.t('test_track.case.minder_create_tip'));
-      });
+      if (promises.length > 0)
+        Promise.all(promises).then(() => {
+          success(i18n.t('test_track.case.minder_issue_delete_tip'));
+        });
       return isAllIssue;
     }
   }
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 938171fa50..84bab3f25e 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 938171fa506d5b3d8fff9857cb21a83c8e31063e
+Subproject commit 84bab3f25eaef5b58f2928ae5aed6dd50cad3d29