Merge remote-tracking branch 'origin/feat/addSynchronizationData-20240409' into feat/addSynchronizationData-20240409

# Conflicts: # jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
1 year ago · 9968d626da
parent 242c4125e7 1ee8c6ec57
commit 9968d626da
1 changed files with 1 additions and 1 deletions
--- 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
@ -642,13 +642,13 @@
        where tc.ASSIGNEE = #{searchassignee}
        and tc.TENANTID = #{searchtenantid}
        and tc.STATES = 2
+        and op.suspiciousfile = 0
        <if test="izApprovalStatus != null ">
            ${izApprovalStatus.rulesOp}
            (
            #{izApprovalStatus.value} ${izApprovalStatus.dataOp} COALESCE(uf.STATSHIS, 1)
            )
        </if>
-        and op.suspiciousfile = 0
        UNION
        select tc.*,
        uf.COMMENTHIS,