diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml index 7f4870f4..db685b07 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml @@ -185,6 +185,7 @@ + and OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend} @@ -307,6 +308,7 @@ + and tcp.OCPICTUREID ${ocpictureid.dataOp} ${ocpictureid.likestar}#{ocpictureid.value}${ocpictureid.likeend} @@ -499,7 +501,6 @@ left join ocr_picture pic on tcp.PICTUREID = pic.ID - and pic.suspiciousfile = 0 @@ -510,7 +511,12 @@ - order by tcp.${page.sortname} ${page.sortorder} + + order by tcp.${page.sortname} ${page.sortorder} + + + order by pic.${page.sortname} ${page.sortorder} + limit ${page.start}, ${page.Pagesize} @@ -774,42 +780,42 @@