Merge branch 'dev-lili'

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

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