From 1ee8c6ec5785a5cedbd535a184e5f68c2cd70766 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Thu, 11 Apr 2024 17:57:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e62cbb75..9a4a299c 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 @@ -651,10 +651,11 @@ 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 + and op.suspiciousfile = 0 UNION select tc.*, uf.COMMENTHIS, -- 2.39.3 From 242c4125e77c1d4559ea2a9b1f093de1a83ab496 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Thu, 11 Apr 2024 17:57:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c0eac22f..ee810321 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 @@ -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) ) + and op.suspiciousfile = 0 UNION select tc.*, uf.COMMENTHIS, -- 2.39.3