From 3df983cb949428592c961fc5da6bcee842fbd7e6 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sun, 31 Mar 2024 16:02:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/jyjz/flowable/controller/FlowTaskController.java  | 2 --
 .../ocr/service/impl/OcrTaskchildPictureServiceImpl.java | 9 ++++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

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<String> formIds = ocrTaskchildPictureService.validateAssignee(formIdList, userToken);
             // 判断当前任务是否审批完毕
-            List<String> 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<OcrTaskchild
         //目前没有做其他信息返回，如果需要再做修改
         for (OcrTaskchildPicture ocrTaskchildPicture : list) {
             //判断审批人是否为当前登录用户
-            if (userToken.getLoginname().equals(ocrTaskchildPicture.getAssignee())) {
+            if (userToken.getLoginname().equals(ocrTaskchildPicture.getAssignee()) &&
+                    (ocrTaskchildPicture.getStates().intValue() != SystemConstantsOa.OA_STATUS_TYPE_END
+                            && ocrTaskchildPicture.getStates().intValue() != SystemConstantsOa.OA_STATUS_TYPE_REFUSE)) {
                 formIds.add(ocrTaskchildPicture.getId().toString());
             }
         }
@@ -245,10 +247,7 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
         //目前没有做其他信息返回，如果需要再做修改
         for (OcrTaskchildPicture ocrTaskchildPicture : list) {
             //判断当前审批状态为拒绝或者通过的，不允许再做审批
-            if (ocrTaskchildPicture.getStates().intValue() != SystemConstantsOa.OA_STATUS_TYPE_END
-                    && ocrTaskchildPicture.getStates().intValue() != SystemConstantsOa.OA_STATUS_TYPE_REFUSE) {
-                formIds.add(ocrTaskchildPicture.getId().toString());
-            }
+
         }
         return formIds;
     }