From 3cb1201efdbc0cf840e12b56f4f73198e420a771 Mon Sep 17 00:00:00 2001 From: shuliYao <1397940314@qq.com> Date: Tue, 9 Apr 2024 16:32:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BE=E7=89=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E3=80=81=E4=B8=80=E9=94=AE=E6=9F=A5=E9=87=8D=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=201.=E5=9B=BE=E7=89=87=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=81=E4=B8=80=E9=94=AE=E6=9F=A5=E9=87=8D=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=95=B0=E6=8D=AE=202.=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=8F=AF=E7=96=91=E6=96=87=E4=BB=B6=E5=A4=B9=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/controller/OcrCheckDuplicateController.java | 2 ++ .../jyjz/xiaoyao/ocr/controller/OcrPictureController.java | 2 ++ .../ocr/controller/OcrTaskchildDubiousFileController.java | 8 +++++--- 3 files changed, 9 insertions(+), 3 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 74b278e4..8feec464 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 @@ -89,6 +89,8 @@ public class OcrCheckDuplicateController { queryWrapper.eq("tenant_id", tenantId); queryWrapper.eq("suspiciousfile", "0"); queryWrapper.orderBy(true,true,"submit_date_timestamp"); + //本地图片地址，不能为空,为空时查重会有问题 + queryWrapper.isNotNull("local_pictrue_url"); List pageList = ocrPictureService.listPage(queryWrapper); if (null != pageList && !pageList.isEmpty()) { if (pageList.size() == 1) { 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 257a487a..5a84e43a 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 @@ -311,6 +311,8 @@ public class OcrPictureController extends BaseController { queryWrapper = SearchParaFormatting.searchParaParse(queryWrapper, paraMap); queryWrapper.eq("tenant_id", tenantId); + //本地图片地址，不能为空,为空时查重会有问题 + queryWrapper.isNotNull("local_pictrue_url"); Page page = new Page(pageNo, pageSize); IPage pageList = ocrPictureService.page(page, queryWrapper); diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java index e80278c2..9dcace2d 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java @@ -131,9 +131,11 @@ public class OcrTaskchildDubiousFileController { dubiouswrapper.eq("userid",userToken.getUserid()).eq("picture_id",childpictureid); - OcrTaskchildDubiousFile one = ocrTaskchildDubiousFileService.getOne(dubiouswrapper); - if(one != null){ - fileList.add(one); + List dubious = ocrTaskchildDubiousFileService.list(dubiouswrapper); + if(dubious != null){ + for (OcrTaskchildDubiousFile ocrTaskchildDubiousFile : dubious) { + fileList.add(ocrTaskchildDubiousFile); + } } }