From aee0a37b4381ccf6d084085357da3f4601921448 Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Mon, 1 Apr 2024 22:02:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20ai=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8F=8A=E7=9B=B8=E4=BC=BC=E5=BA=A6=E5=88=97=E8=A1=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=9F=A5=E9=87=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OcrTaskchildDubiousFileServiceImpl.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java index 0760b0e5..2b07400e 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildDubiousFileServiceImpl.java @@ -41,8 +41,10 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl dubiousfilelist(Integer pageNo, Integer pageSize, String orderbyname, UserToken userToken, String tenantId) { - Page objectPage = new Page<>(Integer.valueOf(pageNo),Integer.valueOf(pageSize)); + Page objectPage = new Page<>(Integer.valueOf(pageNo), Integer.valueOf(pageSize)); //获取可疑文件图片列表 QueryWrapper dubiouswrapper = new QueryWrapper<>(); - dubiouswrapper.eq("userid",userToken.getUserid()); - dubiouswrapper.eq("tenantid",tenantId); + dubiouswrapper.eq("userid", userToken.getUserid()); + dubiouswrapper.eq("tenantid", tenantId); List list = this.list(dubiouswrapper); - if(list.size()==0){ + if (list.size() == 0) { return objectPage; } @@ -71,17 +73,18 @@ public class OcrTaskchildDubiousFileServiceImpl extends ServiceImpl taskChildPictures = ocrTaskchildPictureService.getDubiousfileList(new ArrayList<>(pictureIdList), userNodeType); - if(CollUtil.isNotEmpty(taskChildPictures)){ + if (CollUtil.isNotEmpty(taskChildPictures)) { //按时间字段排序 - if("desc".equals(orderbyname)){ + if ("desc".equals(orderbyname)) { taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSubmitDateTimestamp).reversed()); - }else{ + } else { taskChildPictures.sort(Comparator.comparing(OcrTaskChildPictureVo::getSubmitDateTimestamp)); } - List records = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); - objectPage.setRecords(records); - objectPage.setTotal(taskChildPictures.size()); + List records = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + objectPage.setRecords(records); + objectPage.setTotal(taskChildPictures.size()); + } return objectPage; } }