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

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,