Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
052eda7838
|
|
@ -34,7 +34,7 @@
|
||||||
left join sys_user su ON su.user_id = atv.create_by
|
left join sys_user su ON su.user_id = atv.create_by
|
||||||
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 != ''">
|
<if test="versionName != null and versionName != ''">
|
||||||
AND version_name LIKE CONCAT('%', #{versionName}, '%')
|
AND atv.version_name LIKE CONCAT('%', #{versionName}, '%')
|
||||||
</if>
|
</if>
|
||||||
GROUP BY ap.task_id, atv.create_time
|
GROUP BY ap.task_id, atv.create_time
|
||||||
ORDER BY atv.create_time DESC
|
ORDER BY atv.create_time DESC
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue