From 9cc371fc7190d10c0539b5829d41e7dec9475c64 Mon Sep 17 00:00:00 2001 From: DELL Date: Mon, 29 Apr 2024 12:20:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=A3=80=E7=B4=A2-=E4=BB=BB=E5=8A=A1id?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0=E3=80=81=E6=8F=90?= =?UTF-8?q?=E6=8A=A5=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jyjz/flowable/controller/FlowTaskController.java | 3 ++- .../resources/mapper/oa/OcrTaskchildPictureMapper.xml | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java index 790df9ba..7c1fb997 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java @@ -316,7 +316,8 @@ public class FlowTaskController extends BaseController { return ResultVoUtil.error("租户主键不能为空"); } if (org.apache.commons.lang3.StringUtils.isNotBlank(taskName)) { - searchQuery.addLike("fromtaskname", taskName); +// searchQuery.addLike("fromtaskname", taskName); + searchQuery.addLike("fuzzyRetrieval", taskName); } //获取用户预设检索条件id,如果存在检索条件，则高级检索失效 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 26e8d481..9b78dd4a 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 @@ -479,6 +479,14 @@ and tcp.USERID ${userid.dataOp} ${userid.likestar}#{userid.value}${userid.likeend} + + and + ( + tcp.FROMUSERNAME LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%') + OR tcp.FROMTASKID LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%') + OR tcp.FROMTASKNAME LIKE CONCAT('%', #{fuzzyRetrieval.value}, '%') + ) + -- 2.39.3