From ecad4a2e31f1ca16022e8b3ab0112adfa35c6642 Mon Sep 17 00:00:00 2001 From: DELL Date: Fri, 19 Apr 2024 16:59:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=85=A8=E6=96=87=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9=E5=92=8C=E7=BB=88=E5=AE=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=8C=83=E5=9B=B4=E4=BF=AE=E6=94=B9=201?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9=E7=94=B1=E5=8E=9F?= =?UTF-8?q?=E6=9D=A5=E7=9A=84STATES=20IN=20('1','2')=20AND=20TASKNAME=20IN?= =?UTF-8?q?=20(=20'=E4=B8=80=E7=BA=A7=E5=AE=A1=E6=89=B9',=20'=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E5=AE=A1=E6=89=B9'=20)=20=E4=BF=AE=E6=94=B9=E4=B8=BAT?= =?UTF-8?q?ASKNODE=20!=3D'finale=5Fjudgment'=202=E3=80=81=E7=BB=88?= =?UTF-8?q?=E5=AE=A1=E6=9F=A5=E8=AF=A2=E6=9C=89=E5=8E=9F=E6=9D=A5=E7=9A=84?= =?UTF-8?q?STATES=20=3D=20'3'=20AND=20TASKNAME=20=3D=20'=E6=9C=80=E7=BB=88?= =?UTF-8?q?=E5=AE=A1=E6=89=B9'=E4=BF=AE=E6=94=B9=E4=B8=BA=20TASKNODE=20=3D?= =?UTF-8?q?=20'finale=5Fjudgment'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml index f0b3fe59..3d0ad3f8 100644 --- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml +++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrSearchHistoryMapper.xml @@ -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' 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' AND (r.FROMTASKNAME LIKE "%"#{search}"%" OR img.field1 LIKE "%"#{search}"%" -- 2.39.3