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') AND at.task_name LIKE CONCAT('%', #{taskName}, '%') @@ -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} AND abf.file_name like concat('%', #{fileName}, '%') @@ -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} @@ -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}