diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/CustomFieldDTO.java b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/CustomFieldDTO.java
index 4a7a0690db..c62271269d 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/CustomFieldDTO.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/dto/sdk/CustomFieldDTO.java
@@ -9,4 +9,5 @@ import java.util.List;
 @Data
 public class CustomFieldDTO extends CustomField {
     private List<CustomFieldOption> options;
+    private boolean used;
 }
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtTemplateCustomFieldMapper.java b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtTemplateCustomFieldMapper.java
new file mode 100644
index 0000000000..aec4d92574
--- /dev/null
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtTemplateCustomFieldMapper.java
@@ -0,0 +1,9 @@
+package io.metersphere.system.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ExtTemplateCustomFieldMapper {
+    List<String> selectUsedFieldIds(@Param("fieldIds") List<String> list);
+}
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtTemplateCustomFieldMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtTemplateCustomFieldMapper.xml
new file mode 100644
index 0000000000..d4e01e49da
--- /dev/null
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtTemplateCustomFieldMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.metersphere.system.mapper.ExtTemplateCustomFieldMapper">
+
+    <select id="selectUsedFieldIds" resultType="java.lang.String">
+        SELECT distinct field_id
+        FROM template_custom_field
+        WHERE field_id in
+        <foreach collection="fieldIds" item="fieldId" open="(" close=")" separator=",">
+            #{fieldId}
+        </foreach>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseCustomFieldService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseCustomFieldService.java
index 5a95169956..8a00e2bab1 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseCustomFieldService.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseCustomFieldService.java
@@ -15,6 +15,7 @@ import io.metersphere.system.dto.request.DefaultFunctionalCustomField;
 import io.metersphere.system.dto.sdk.CustomFieldDTO;
 import io.metersphere.system.dto.sdk.request.CustomFieldOptionRequest;
 import io.metersphere.system.mapper.CustomFieldMapper;
+import io.metersphere.system.mapper.ExtTemplateCustomFieldMapper;
 import io.metersphere.system.mapper.TemplateCustomFieldMapper;
 import io.metersphere.system.uid.IDGenerator;
 import io.metersphere.system.utils.ServiceUtils;
@@ -50,6 +51,8 @@ public class BaseCustomFieldService {
     protected BaseOrganizationParameterService baseOrganizationParameterService;
     @Resource
     protected TemplateCustomFieldMapper templateCustomFieldMapper;
+    @Resource
+    private ExtTemplateCustomFieldMapper extTemplateCustomFieldMapper;
 
     private static final String CREATE_USER = "CREATE_USER";
 
@@ -57,6 +60,11 @@ public class BaseCustomFieldService {
         checkScene(scene);
         List<CustomField> customFields = getByScopeIdAndScene(scopeId, scene);
         List<String> userIds = customFields.stream().map(CustomField::getCreateUser).toList();
+        List<String> usedFieldIds = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(customFields)) {
+            usedFieldIds.addAll(extTemplateCustomFieldMapper.selectUsedFieldIds(customFields.stream().map(CustomField::getId).toList()));
+        }
+
         Map<String, String> userNameMap = userLoginService.getUserNameMap(userIds);
         List<CustomFieldOption> customFieldOptions = baseCustomFieldOptionService.getByFieldIds(customFields.stream().map(CustomField::getId).toList());
         Map<String, List<CustomFieldOption>> optionMap = customFieldOptions.stream().collect(Collectors.groupingBy(CustomFieldOption::getFieldId));
@@ -67,6 +75,10 @@ public class BaseCustomFieldService {
             }
             CustomFieldDTO customFieldDTO = new CustomFieldDTO();
             BeanUtils.copyBean(customFieldDTO, item);
+            //判断有没有用到
+            if (usedFieldIds.contains(item.getId())) {
+                customFieldDTO.setUsed(true);
+            }
             customFieldDTO.setOptions(optionMap.get(item.getId()));
             if (CustomFieldType.getHasOptionValueSet().contains(customFieldDTO.getType()) && customFieldDTO.getOptions() == null) {
                 customFieldDTO.setOptions(List.of());
diff --git a/frontend/src/models/setting/template.ts b/frontend/src/models/setting/template.ts
index 42765237dc..5b7ad59bca 100644
--- a/frontend/src/models/setting/template.ts
+++ b/frontend/src/models/setting/template.ts
@@ -63,6 +63,7 @@ export interface FieldOption {
 export interface AddOrUpdateField {
   id?: string;
   name: string;
+  used: boolean;
   scene: SeneType; // 使用场景
   type: FormItemType;
   remark: string; // 备注
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/export/validateResult.vue b/frontend/src/views/case-management/caseManagementFeature/components/export/validateResult.vue
index 031a766477..a7b59a60d9 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/export/validateResult.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/export/validateResult.vue
@@ -57,7 +57,9 @@
           </template>
         </a-popover>
       </div>
-      <div> {{ t('caseManagement.featureCase.afterFailingToModify', { type: props.validateType }) }}</div>
+      <div v-if="validateResultInfo.failCount > 0">
+        {{ t('caseManagement.featureCase.afterFailingToModify', { type: props.validateType }) }}</div
+      >
     </div>
     <template #footer>
       <div class="flex justify-end">
diff --git a/frontend/src/views/setting/organization/template/components/editFieldDrawer.vue b/frontend/src/views/setting/organization/template/components/editFieldDrawer.vue
index 2acc5805ca..43e20ee3d4 100644
--- a/frontend/src/views/setting/organization/template/components/editFieldDrawer.vue
+++ b/frontend/src/views/setting/organization/template/components/editFieldDrawer.vue
@@ -163,6 +163,7 @@
   });
   const initFieldForm: AddOrUpdateField = {
     name: '',
+    used: false,
     type: undefined,
     remark: '',
     scopeId: scopeId.value,
@@ -278,6 +279,7 @@
 
       const params: AddOrUpdateField = {
         name,
+        used: false,
         options,
         scopeId: scopeId.value,
         scene,
diff --git a/frontend/src/views/setting/organization/template/components/fieldSetting.vue b/frontend/src/views/setting/organization/template/components/fieldSetting.vue
index dce1674f7f..e1ddf31abd 100644
--- a/frontend/src/views/setting/organization/template/components/fieldSetting.vue
+++ b/frontend/src/views/setting/organization/template/components/fieldSetting.vue
@@ -325,10 +325,14 @@
   const deleteApi = getFieldRequestApi(props.mode).delete;
   // 删除字段
   const handlerDelete = (record: AddOrUpdateField) => {
+    let contentStr = t('system.orgTemplate.deleteFiledContentNotUsed');
+    if (record.used) {
+      contentStr = t('system.orgTemplate.deleteFiledContent');
+    }
     openModal({
       type: 'error',
       title: t('system.orgTemplate.deleteTitle', { name: characterLimit(record.name) }),
-      content: t('system.orgTemplate.deleteFiledContent'),
+      content: contentStr,
       okText: t('common.confirmDelete'),
       cancelText: t('common.cancel'),
       okButtonProps: {
diff --git a/frontend/src/views/setting/organization/template/locale/en-US.ts b/frontend/src/views/setting/organization/template/locale/en-US.ts
index 8d10f94cf4..55d6b6a228 100644
--- a/frontend/src/views/setting/organization/template/locale/en-US.ts
+++ b/frontend/src/views/setting/organization/template/locale/en-US.ts
@@ -129,6 +129,7 @@ export default {
     'After delete, will be effective in the project and delete irrevocable, please careful operation.',
   'system.orgTemplate.deleteFiledContent':
     'This field has been used in the template, data will be lost after deletion, please be careful!',
+  'system.orgTemplate.deleteFiledContentNotUsed': 'This field will be lost, please be careful!',
   'system.orgTemplate.deleteSuccess': 'Delete Successfully',
   'system.orgTemplate.setInitStateSuccess': 'Set the initial state successfully',
   'system.orgTemplate.setEndStateSuccess': 'Setting the end status succeeded',
diff --git a/frontend/src/views/setting/organization/template/locale/zh-CN.ts b/frontend/src/views/setting/organization/template/locale/zh-CN.ts
index 20f629ebf2..19ebcde41c 100644
--- a/frontend/src/views/setting/organization/template/locale/zh-CN.ts
+++ b/frontend/src/views/setting/organization/template/locale/zh-CN.ts
@@ -123,6 +123,7 @@ export default {
   'system.orgTemplate.deleteStateTitle': '确定删除 {name} 状态吗？',
   'system.orgTemplate.deleteStateContent': '删除后，会在项目中立即生效且删除不可撤回，请谨慎操作！',
   'system.orgTemplate.deleteFiledContent': '该字段在模板中已使用，删除后数据将会丢失，请谨慎操作！',
+  'system.orgTemplate.deleteFiledContentNotUsed': '删除后，字段将从字段列表移除，请谨慎操作！',
   'system.orgTemplate.deleteSuccess': '删除成功',
   'system.orgTemplate.setInitStateSuccess': '设置初始态成功',
   'system.orgTemplate.setEndStateSuccess': '设置结束状态成功',