From ab663eec14b2fad3c8e56d7cd52474a6edffe41d Mon Sep 17 00:00:00 2001
From: LHD_HY <2872546851@qq.com>
Date: Fri, 6 Feb 2026 09:08:52 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/web/service/data/LabelService.java     | 2 +-
 bonus-data/src/main/resources/mapper/DIAuditMapper.xml    | 8 ++++++--
 bonus-data/src/main/resources/mapper/DLabelMapper.xml     | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bonus-admin/src/main/java/com/bonus/web/service/data/LabelService.java b/bonus-admin/src/main/java/com/bonus/web/service/data/LabelService.java
index 0cc8c24..0e8a99e 100644
--- a/bonus-admin/src/main/java/com/bonus/web/service/data/LabelService.java
+++ b/bonus-admin/src/main/java/com/bonus/web/service/data/LabelService.java
@@ -287,7 +287,7 @@ public class LabelService {
                         .mapToInt(Integer::intValue)
                         .sum();
                 if (sum > 0) {
-                    return AjaxResult.error("团队被关联使用，无法删除");
+                    return AjaxResult.error("标签被关联使用，无法删除");
                 }
             }
             // 2.删除标签数据
diff --git a/bonus-data/src/main/resources/mapper/DIAuditMapper.xml b/bonus-data/src/main/resources/mapper/DIAuditMapper.xml
index a077dfb..c9de926 100644
--- a/bonus-data/src/main/resources/mapper/DIAuditMapper.xml
+++ b/bonus-data/src/main/resources/mapper/DIAuditMapper.xml
@@ -213,7 +213,7 @@
     <select id="getAuditPictures" parameterType="com.bonus.common.domain.data.dto.LabelingTaskDto" resultMap="LabelingTaskVoResult">
         SELECT
             tls.labeling_sample_id,tls.is_invalid_data,tls.dataset_sample_id,t1.file_path,
-            tld.label_id,tld.labeling_color,tld.labeling_coordinate,tld.box_type,tld.text_content
+            t2.label_id,t2.labeling_color,t2.labeling_coordinate,t2.box_type,t2.text_content,t2.label_name
         FROM tb_labeling_sample tls
                  LEFT JOIN (
             SELECT tds.sample_id,tds.dataset_sample_id,ts.file_path
@@ -221,8 +221,12 @@
                      LEFT JOIN tb_sample ts ON ts.sample_id = tds.sample_id
             WHERE ts.del_flag = '0'
         ) t1 ON t1.dataset_sample_id = tls.dataset_sample_id
-                 LEFT JOIN tb_labeling_data tld ON tld.labeling_sample_id = tls.labeling_sample_id
         LEFT JOIN tb_labeling_sample_audit_record tlsar ON tlsar.labeling_sample_id = tls.labeling_sample_id
+                 LEFT JOIN
+             (SELECT tld.label_id,tld.labeling_color,tld.labeling_sample_id,tld.labeling_coordinate,tld.box_type,tld.text_content,tl.label_name
+              FROM tb_labeling_data tld
+                       LEFT JOIN tb_label tl ON tl.label_id = tld.label_id
+             ) t2 ON t2.labeling_sample_id = tls.labeling_sample_id
         WHERE tls.del_flag = '0'
           AND tlsar.audit_node = #{labelingTaskNode}
           AND tls.labeling_status ='1'
diff --git a/bonus-data/src/main/resources/mapper/DLabelMapper.xml b/bonus-data/src/main/resources/mapper/DLabelMapper.xml
index 28e5b66..a4fb1b1 100644
--- a/bonus-data/src/main/resources/mapper/DLabelMapper.xml
+++ b/bonus-data/src/main/resources/mapper/DLabelMapper.xml
@@ -110,7 +110,8 @@
         update_time AS updateTime,
         create_time AS createTime
         FROM tb_label
-        WHERE label_group_id = #{labelGroupId}
+        WHERE del_flag = '0'
+          AND label_group_id = #{labelGroupId}
         <if test="labelName != null and labelName != ''">
             AND label_name LIKE CONCAT('%', #{labelName}, '%')
         </if>