|
|
|
@ -638,7 +638,7 @@
|
|
|
|
|
op.releaseArea as fromCity
|
|
|
|
|
from ocr_taskchild_picture tc
|
|
|
|
|
LEFT JOIN OA_USERAPPROVE_T uf ON tc.ID = uf.ID
|
|
|
|
|
left join ocr_picture op on tc.PICTUREID = op.ID and op.suspiciousfile = 0
|
|
|
|
|
left join ocr_picture op on tc.PICTUREID = op.ID
|
|
|
|
|
where tc.ASSIGNEE = #{searchassignee}
|
|
|
|
|
and tc.TENANTID = #{searchtenantid}
|
|
|
|
|
and tc.STATES = 2
|
|
|
|
@ -648,6 +648,7 @@
|
|
|
|
|
#{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1)
|
|
|
|
|
)
|
|
|
|
|
</if>
|
|
|
|
|
and op.suspiciousfile = 0
|
|
|
|
|
UNION
|
|
|
|
|
select tc.*,
|
|
|
|
|
uf.COMMENTHIS,
|
|
|
|
|