From 3ca4a8c972ac70801f49515dcc5419964b002409 Mon Sep 17 00:00:00 2001
From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com>
Date: Mon, 2 Dec 2024 16:19:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=9C=80=E6=96=B0=E7=9A=84=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/AnnotationTaskMapper.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml
index 444f29d..9a08b19 100644
--- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml
+++ b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml
@@ -90,7 +90,7 @@
         LEFT JOIN ai_annotation_task_annotator_map ap on at.task_id = ap.task_id
         LEFT JOIN ai_dataset ad on ad.dataset_id = at.dataset_id
         LEFT JOIN sys_user su  on su.user_id = at.create_by
-        WHERE at.del_flag = '0' and ap.annotation_status IN ('0', '1', '2','3')
+        WHERE at.del_flag = '0' and ap.del_flag = '0' and ap.annotation_status IN ('0', '1', '2','3')
         <if test="taskName != null and taskName != ''">
             AND at.task_name LIKE CONCAT('%', #{taskName}, '%')
         </if>
@@ -245,7 +245,7 @@
         LEFT JOIN ai_dataset_file_map adfm ON abf.file_id = adfm.file_id
         LEFT JOIN ai_annotation_task aat ON aat.dataset_id= adfm.dataset_id
         LEFT JOIN ai_annotation_task_annotator_map atap on atap.task_id = aat.task_id and abf.file_id = atap.file_id
-        where abf.del_flag  = '0' and aat.del_flag = '0' and  aat.task_id = #{taskId}
+        where abf.del_flag  = '0' and aat.del_flag = '0'  and atap.del_flag = '0' and  aat.task_id = #{taskId}
         <if test="fileName != null and fileName != ''">
             AND abf.file_name like concat('%', #{fileName}, '%')
         </if>
@@ -316,7 +316,7 @@
         SELECT distinct at.task_id AS taskId, at.task_name AS taskName, at.labels as labels
         FROM ai_annotation_task at
         LEFT JOIN ai_annotation_task_annotator_map ap on at.task_id = ap.task_id
-        WHERE at.del_flag = '0'  and ap.annotator_id = #{annotatorId}
+        WHERE at.del_flag = '0' and ap.del_flag = '0' and ap.annotator_id = #{annotatorId}
     </select>
 
 <!--    and ap.annotation_status IN ('0','1')-->
@@ -324,7 +324,7 @@
         SELECT distinct at.task_id AS taskId , at.task_name AS taskName, at.labels as labels
         FROM ai_annotation_task at
         LEFT JOIN ai_annotation_task_annotator_map ap on at.task_id = ap.task_id
-        WHERE at.del_flag = '0' and ap.reviewer_id = #{reviewerId}
+        WHERE at.del_flag = '0' and ap.del_flag = '0' and ap.reviewer_id = #{reviewerId}
     </select>
 
     <select id="selectAnnotationDetailByTaskFile"