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