|
|
|
@ -29,8 +29,7 @@
|
|
|
|
|
LEFT JOIN ocr_picture img ON r.PICTUREID = img.ID
|
|
|
|
|
WHERE
|
|
|
|
|
r.ASSIGNEE = #{userid} AND
|
|
|
|
|
r.STATES IN ('1','2') AND
|
|
|
|
|
r.TASKNAME IN ( '一级审批', '二级审批' )
|
|
|
|
|
r.TASKNODE != 'finale_judgment'
|
|
|
|
|
<if test="search != null and search != ''">
|
|
|
|
|
AND (r.FROMTASKNAME LIKE "%"#{search}"%"
|
|
|
|
|
OR img.field1 LIKE "%"#{search}"%"
|
|
|
|
@ -49,8 +48,7 @@
|
|
|
|
|
LEFT JOIN ocr_picture img ON r.PICTUREID = img.ID
|
|
|
|
|
WHERE
|
|
|
|
|
r.ASSIGNEE = #{userid} AND
|
|
|
|
|
r.STATES = '3' AND
|
|
|
|
|
r.TASKNAME = '最终审批'
|
|
|
|
|
r.TASKNODE = 'finale_judgment'
|
|
|
|
|
<if test="search != null and search != ''">
|
|
|
|
|
AND (r.FROMTASKNAME LIKE "%"#{search}"%"
|
|
|
|
|
OR img.field1 LIKE "%"#{search}"%"
|
|
|
|
|