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 6d93dc71..e0ca6214 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 @@ -756,9 +756,13 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl().eq(Department::getDeptno, picture.getTenantId())); + if(1==dept.getTypedept()){ + dept = departmentService.getOne(new LambdaQueryWrapper().eq(Department::getDeptno, dept.getParentid())); + } FlowResultDto flowResultDto = new FlowResultDto(); - flowResultDto.setTenantNo(picture.getTenantId()); - flowResultDto.setAccountNo(Long.parseLong(picture.getPictureid())); + flowResultDto.setTenantNo(Long.valueOf(dept.getDeptno())); + flowResultDto.setAccountNo(Long.parseLong(picture.getTenantId().toString())); flowResultDto.setTaskNo(Long.parseLong(picture.getRemark())); flowResultDto.setPictureMatchDegree(BigDecimal.valueOf(picture.getSimilarityscore())); flowResultDto.setIsPictureRepeat(picture.getField14() == null ? 0 : Integer.valueOf(picture.getField14()));