diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java index c2736857..4b95acfd 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildPictureController.java @@ -291,7 +291,8 @@ public class OcrTaskchildPictureController extends BaseController { public ResultVo getdateOcrTaskchildPicture(HttpServletResponse response, HttpServletRequest request, @PathVariable("packageid") Long packageid, @PathVariable("id") Long id) throws IOException { - OcrTaskchildPicture dto = this.ocrTaskchildPictureService.listPicturePackageId(id.toString(), packageid); + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); + OcrTaskchildPicture dto = this.ocrTaskchildPictureService.listPicturePackageId(id.toString(), packageid,userToken); if (null != dto) { return ResultVoUtil.success(dto); } else { diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java index 0059f387..e610a2fb 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskchildPicture.java @@ -225,6 +225,10 @@ public class OcrTaskchildPicture implements BaseDto,java.io.Serializable { @TableField(exist = false) private String reporttime; + @ApiModelProperty(value ="本人审查日志") + @TableField(exist = false) + private Userapprove userapprove; + @ApiModelProperty(value ="审查日志") @TableField(exist = false) private List userapproveList; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java index 59ce5ff6..8b00fa35 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/OcrTaskchildPictureService.java @@ -58,7 +58,7 @@ public interface OcrTaskchildPictureService extends BaseService list = userapproveService.list(new LambdaQueryWrapper().eq(Userapprove::getFormid, fromid)); ocrTaskchildPicture.setUserapproveList(list); + if(null !=userToken){ + Optional first = list.stream().filter(userapprove -> userapprove.getUserid().toString().equals(userToken.getUserid())).findFirst(); + ocrTaskchildPicture.setUserapprove(first.orElse(new Userapprove())); + } //查询图片对象 OcrPicture ocrPicture = this.ocrPictureService.selectDtoById(ocrTaskchildPicture.getPictureid());