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 397bcbf2..707054db 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 b5e1ca65..902d3e06 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");