fix: 图片查询、一键查重过滤本地图片地址为空数据

1.图片查询、一键查重过滤本地图片地址为空数据
2.解决可疑文件夹重复数据报错问题

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<OcrPicture> pageList = ocrPictureService.listPage(queryWrapper);
         if (null != pageList && !pageList.isEmpty()) {
             if (pageList.size() == 1) {

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<OcrPicture> page = new Page<OcrPicture>(pageNo, pageSize);
         IPage<OcrPicture> pageList = ocrPictureService.page(page, queryWrapper);
 

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);
+            List<OcrTaskchildDubiousFile> dubious = ocrTaskchildDubiousFileService.list(dubiouswrapper);
-            if(one != null){
+            if(dubious != null){
-                fileList.add(one);
+                for (OcrTaskchildDubiousFile ocrTaskchildDubiousFile : dubious) {
+                    fileList.add(ocrTaskchildDubiousFile);
+                }
             }
         }