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); + } } }