diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java index df3e23e0..8d39acc8 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java @@ -294,7 +294,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl().eq(OcrTaskchildPicture::getPictureid, ocrPicture.getId())); - if(ObjectUtils.isNotEmpty(one)){ + if (ObjectUtils.isNotEmpty(one)) { continue; } //查询项目对象 @@ -369,7 +369,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid())).findFirst(); - ocrTaskchildPicture.setUserapprove(first.orElse(new Userapprove())); + Userapprove userapprove = new Userapprove(); + userapprove.setStatshis(1); + ocrTaskchildPicture.setUserapprove(first.orElse(userapprove)); } //查询图片对象 OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid()); @@ -627,7 +629,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl getPictureHistoryList(List pictureIds, String taskname) { - return ocrtaskchildpicturemybatisdao.getPictureHistoryList(pictureIds,taskname); + return ocrtaskchildpicturemybatisdao.getPictureHistoryList(pictureIds, taskname); } @Override @@ -680,8 +682,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl getPackageSimilarityList(Integer pageNo, Integer pageSize, String oderType, String oderName, String checkDuplicateId, String pictureId) { - Page page = new Page<>(pageNo,pageSize); + Page page = new Page<>(pageNo, pageSize); - return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page,checkDuplicateId,pictureId,oderType,oderName); + return ocrtaskchildpicturemybatisdao.getPackageSimilarityList(page, checkDuplicateId, pictureId, oderType, oderName); } }