Merge remote-tracking branch 'origin/main'

# Conflicts:
#	bonus-modules/bonus-ai/src/main/resources/mapper/ReleaseVersionMapper.xml
This commit is contained in:
weiweiw 2024-11-27 12:51:51 +08:00
commit b57f1fdb3f
1 changed files with 1 additions and 1 deletions

View File

@ -30,7 +30,7 @@
left join ai_annotation_task aat on aat.task_id = atv.task_id
left join ai_dataset ad on ad.dataset_id = atv.dataset_id
left join ai_annotation_task_annotator_map ap on atv.task_id = ap.task_id
where atv.del_flag = '0' and ap.annotation_status IN ('0', '1', '2','3') and atv.dataset_id = #{datasetId}
where atv.del_flag = '0' and ap.annotation_status IN ('0', '1', '2','3') and atv.dataset_id =#{datasetId}
<if test="versionName != null and versionName != ''">
AND version_name LIKE CONCAT('%', #{versionName}, '%')
</if>