From ef562ea16e77c12719dc5e70f48701c991831ca0 Mon Sep 17 00:00:00 2001
From: "707464720@qq.com" <707464720@qq.com>
Date: Tue, 26 Mar 2024 16:46:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:1.AI=E6=9F=A5=E9=87=8D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9F=A5=E8=AF=A2-=E7=9B=B8=E4=BC=BC?=
 =?UTF-8?q?=E5=BA=A6=E3=80=81=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaoyao/ocr/controller/OcrPictureController.java  | 11 +++++++++++
 .../service/impl/OcrCheckDuplicateServiceImpl.java    |  4 ++++
 2 files changed, 15 insertions(+)

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 b17ef60d..f9cba1e4 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
@@ -276,6 +276,17 @@ public class OcrPictureController extends BaseController {
                 queryWrapper.orderByDesc("similarity_score");
             }
         }
+
+        //按时间排序
+        String orderByTime = req.getParameter("orderByTime");
+        if (StringUtils.isNotBlank(orderByTime)) {
+            if (orderByTime.equals("0")) {
+                queryWrapper.orderByAsc("create_time");
+            } else {
+                queryWrapper.orderByDesc("create_time");
+            }
+        }
+
         if (StringUtils.isNotBlank(search_month) && Integer.parseInt(search_month) <= 12 && Integer.parseInt(search_month) > 0) {
             queryWrapper.ge("create_time", DataUtil.afterDateByMonth(Integer.parseInt(search_month)));
         }
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java
index ec70f7ae..23c555a8 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java
@@ -401,7 +401,11 @@ public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateM
                 picIdList.add(ocrCheckDuplicateResult.getPictureId());
             }
         }
+        if(CollUtil.isEmpty(picIdList)){
+            return  new Page<OcrPicture>(pageNo, pageSize);
+        }
 
+        //分页返回图片信息
         queryWrapper.in("id",picIdList);
         queryWrapper.eq("tenant_id", tenantId);