diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java index 475b1720..039a88aa 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java @@ -168,8 +168,6 @@ public class FlowTaskController extends BaseController { //判断当前任务审批人是否一致 List formIds = ocrTaskchildPictureService.validateAssignee(formIdList, userToken); // 判断当前任务是否审批完毕 - List formId = this.ocrTaskchildPictureService.validateApprove(formIdList); - formIds.addAll(formId); if (CollectionUtils.isNotEmpty(formIds)) { Integer success = flowTaskService.complete(approve, userToken); return ResultVoUtil.success("审批成功" + success + "条," + "无权审核" + (flowTaskInfoList.size() - success) + "条",""); 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 a9958cb8..2aa9cc5a 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 @@ -224,7 +224,9 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl