From 529f06cf4f60623222fa497cbf166f90046d36c2 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Mon, 20 May 2024 16:37:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/controller/OcrCheckDuplicateController.java        | 7 +++++--
 .../jyjz/xiaoyao/ocr/controller/OcrPictureController.java  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java
index 397bcbf..707054d 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java
@@ -85,8 +85,11 @@ public class OcrCheckDuplicateController {
         //提报人模糊搜索
         String upUserName = req.getParameter("upUserName");
         if(StringUtils.isNotBlank(upUserName)){
-            queryWrapper.like("upName",upUserName);
-            queryWrapper.like("taskName", upUserName);
+            queryWrapper.and(q->{
+                q.like("upName",upUserName).or().eq("taskName",upUserName);
+            });
+//            queryWrapper.like("upName",upUserName);
+//            queryWrapper.like("taskName", upUserName);
         }
 
         //任务状态搜索
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
index b5e1ca6..902d3e0 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureController.java
@@ -301,8 +301,11 @@ public class OcrPictureController extends BaseController {
         //提报人模糊搜索
         String upUserName = req.getParameter("upUserName");
         if (StringUtils.isNotBlank(upUserName)) {
-            queryWrapper.like("upName", upUserName);
-            queryWrapper.like("taskName", upUserName);
+            queryWrapper.and(q->{
+               q.like("upName",upUserName).or().eq("taskName",upUserName);
+            });
+//            queryWrapper.like("upName", upUserName);
+//            queryWrapper.like("taskName", upUserName);
         }
         //任务状态搜索
         String iztaskstatus = req.getParameter("iztaskstatus");