diff --git a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue
index 161af4ae80..9bfd9c9907 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/tabContent/tabBug/tabDefect.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="flex items-center justify-between">
       <div v-if="showType === 'link'" class="flex">
-        <a-tooltip :disabled="!!linkPropsRes.data.length">
+        <a-tooltip v-if="!total">
           <template #content>
             {{ t('caseManagement.featureCase.noAssociatedDefect') }}
             <span v-permission="['PROJECT_BUG:READ+ADD']" class="text-[rgb(var(--primary-4))]" @click="createDefect">{{
@@ -11,7 +11,7 @@
           </template>
           <a-button
             v-permission="['FUNCTIONAL_CASE:READ+UPDATE']"
-            :disabled="!linkPropsRes.data.length"
+            :disabled="total ? false : true"
             class="mr-3"
             type="primary"
             @click="linkDefect"
@@ -19,6 +19,15 @@
             {{ t('caseManagement.featureCase.linkDefect') }}
           </a-button>
         </a-tooltip>
+        <a-button
+          v-if="hasAnyPermission(['FUNCTIONAL_CASE:READ+UPDATE']) && total"
+          :disabled="total ? false : true"
+          class="mr-3"
+          type="primary"
+          @click="linkDefect"
+        >
+          {{ t('caseManagement.featureCase.linkDefect') }}
+        </a-button>
         <a-button v-permission="['PROJECT_BUG:READ+ADD']" type="outline" @click="createDefect"
           >{{ t('caseManagement.featureCase.createDefect') }}
         </a-button>
@@ -111,12 +120,9 @@
       <template v-if="(keyword || '').trim() === ''" #empty>
         <div class="flex w-full items-center justify-center">
           {{ t('caseManagement.featureCase.tableNoDataWidthComma') }}
-          <span
-            v-if="
-              !linkPropsRes.data.length && hasAnyPermission(['FUNCTIONAL_CASE:READ+UPDATE', 'PROJECT_BUG:READ+ADD'])
-            "
-            >{{ t('caseManagement.featureCase.please') }}</span
-          >
+          <span v-if="!total && hasAnyPermission(['FUNCTIONAL_CASE:READ+UPDATE', 'PROJECT_BUG:READ+ADD'])">{{
+            t('caseManagement.featureCase.please')
+          }}</span>
           <MsButton
             v-if="linkPropsRes.data.length && hasAnyPermission(['FUNCTIONAL_CASE:READ+UPDATE'])"
             class="ml-[8px]"
@@ -225,7 +231,7 @@
   import LinkDefectDrawer from './linkDefectDrawer.vue';
   import TableFilter from '@/views/case-management/caseManagementFeature/components/tableFilter.vue';
 
-  import { getCustomOptionHeader } from '@/api/modules/bug-management';
+  import { getBugList, getCustomOptionHeader } from '@/api/modules/bug-management';
   import {
     associatedDrawerDebug,
     cancelAssociatedDebug,
@@ -236,8 +242,9 @@
   import useFeatureCaseStore from '@/store/modules/case/featureCase';
   import { hasAnyPermission } from '@/utils/permission';
 
-  import { BugOptionItem } from '@/models/bug-management';
+  import { BugListItem, BugOptionItem } from '@/models/bug-management';
   import type { TableQueryParams } from '@/models/common';
+  import { CommonList } from '@/models/common';
 
   const featureCaseStore = useFeatureCaseStore();
 
@@ -512,10 +519,25 @@
   //     }
   //   }
   // );
+  const total = ref<number>(0);
+  async function initBugList() {
+    const res = await getBugList({
+      current: 1,
+      pageSize: 10,
+      sort: {},
+      filter: {},
+      keyword: '',
+      combine: {},
+      searchMode: 'AND',
+      projectId: appStore.currentProjectId,
+    });
+    total.value = res.total;
+  }
 
   onMounted(() => {
     getFetch();
     initFilterOptions();
+    initBugList();
   });
 </script>
 
diff --git a/frontend/src/views/setting/organization/template/components/addTemplate.vue b/frontend/src/views/setting/organization/template/components/addTemplate.vue
index fab962fb3c..0295d6f6d1 100644
--- a/frontend/src/views/setting/organization/template/components/addTemplate.vue
+++ b/frontend/src/views/setting/organization/template/components/addTemplate.vue
@@ -103,10 +103,10 @@
                     @click="editField(formItem as DefinedFieldItem)"
                   />
                 </a-tooltip>
-                <a-divider v-if="!formItem.internal" direction="vertical" class="!m-0 !mx-2" />
+                <a-divider v-if="!formItem.templateRequired" direction="vertical" class="!m-0 !mx-2" />
                 <a-tooltip :content="t('common.delete')">
                   <MsIcon
-                    v-if="!formItem.internal"
+                    v-if="!formItem.templateRequired"
                     type="icon-icon_delete-trash_outlined"
                     size="16"
                     @click="deleteSelectedField(formItem as DefinedFieldItem)"
diff --git a/frontend/src/views/setting/organization/template/components/fieldSetting.vue b/frontend/src/views/setting/organization/template/components/fieldSetting.vue
index 363bcdcf00..e1ddf31abd 100644
--- a/frontend/src/views/setting/organization/template/components/fieldSetting.vue
+++ b/frontend/src/views/setting/organization/template/components/fieldSetting.vue
@@ -75,16 +75,16 @@
             @confirm="handleOk(record)"
           >
             <MsButton
-              v-if="!record.templateRequired && hasAnyPermission(props.updatePermission)"
+              v-if="!record.internal && hasAnyPermission(props.updatePermission)"
               :disabled="record.internal"
               class="!mr-0"
               >{{ t('system.orgTemplate.edit') }}</MsButton
             ></MsPopConfirm
           >
 
-          <a-divider v-if="!record.templateRequired" class="h-[12px]" direction="vertical" />
+          <a-divider v-if="!record.internal" class="h-[12px]" direction="vertical" />
           <MsTableMoreAction
-            v-if="!record.templateRequired"
+            v-if="!record.internal"
             v-permission="props.deletePermission"
             :list="moreActions"
             @select="(item) => handleMoreActionSelect(item, record)"