From 57e22e39b9b2d12051e5661d98ed2ef8e0ab2e57 Mon Sep 17 00:00:00 2001
From: sunchenliang <2532527871@qq.com>
Date: Sun, 24 Mar 2024 21:38:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowTaskServiceImpl.java       | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
index 9f369111..7c97f303 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
@@ -453,13 +453,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             }
             variables.put("approvd", taskVO.getApprovd());
             OcrTaskchildPicture model = ocrTaskchildPictureService.getById(Long.parseLong(taskVO.getFormid()));
-
             //只有同意，再进行候选人设置
             if (taskVO.getApprovd()) {
                 //进入下一个节点
                 taskService.complete(task.getId(), variables);
-
-
                 //判断是否存在表单二次提交
                 if (StringUtils.isNotBlank(taskVO.getDocumentation()) && taskVO.getDocumentation().equals(SystemConstantsOa.OA_TASK_COMPLETE_FORM)) {
                     //获取流程类型
@@ -493,13 +490,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     }
                 }
                 updateAssignee(task.getProcessInstanceId(), task.getProcessDefinitionId(), processDefinition);
-
                 String category = processDefinition.getCategory();
                 Category categoryDto = this.categoryService.getCategory(category);
                 IFormCustomService iFormCustomService = SpringUtils.getBean(categoryDto.getServicename());
-
                 FlowModelVO formData = iFormCustomService.getForm(taskVO.getFormid());
-
                 List<Task> taskList = this.nowRunTask(formData.getProcessInstanceId(), formData.getProcessdefinitionid());
                 Task taskData = null;
                 if (null != taskList && !taskList.isEmpty()) {
@@ -512,8 +506,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     model.setFinishtime(System.currentTimeMillis());
                     ocrTaskchildPictureService.updateById(model);
                 } else {
+                    OcrTaskchildPicture childPicture = ocrTaskchildPictureService.getById(Long.parseLong(taskVO.getFormid()));
                     UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-                    cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(model.getAssignee());
+                    cn.jyjz.xiaoyao.common.base.vo.User byLoginname = userTokenService.findByLoginname(childPicture.getAssignee());
                     OcrMsg msg = new OcrMsg();
                     msg.setCreateTime(System.currentTimeMillis());
                     msg.setSendTime(System.currentTimeMillis());
@@ -523,7 +518,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     JSONObject jsonObject = new JSONObject();
                     jsonObject.put("taskId", model.getFromtaskid());
                     jsonObject.put("nodeName", model.getTaskname());
-                    jsonObject.put("states", model.getStates());
+                    jsonObject.put("states", 1);
                     jsonObject.put("sendUserId", userToken.getUserid());
                     jsonObject.put("sendUserName", userToken.getUsername());
                     jsonObject.put("sendTime", System.currentTimeMillis());
@@ -552,7 +547,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     FlowElement flowElement = bpmnModel.getFlowElement(task.getTaskDefinitionKey());
                     if (flowElement instanceof UserTask) {
                         UserTask userTask = (UserTask) flowElement;
-
                         //如果审批不存在，需要在候选组中查询
                         if (StringUtils.isBlank(userTask.getAssignee())) {
                             assignee = userTask.getAssignee();
@@ -563,7 +557,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                     //设置流程结束状态
                     iFormCustomService.endForm(busskey[1], SystemConstantsOa.OA_STATUS_TYPE_REFUSE, assignee, task.getProcessInstanceId(), task.getName());
                 }
-
                 //1、获取终止节点
                 List<EndEvent> endNodes = findEndFlowElement(task.getProcessDefinitionId());
                 String endId = endNodes.get(0).getId();
@@ -576,13 +569,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 taskchildPicture.setFinishtime(System.currentTimeMillis());
                 ocrTaskchildPictureService.updateById(taskchildPicture);
             }
-
-
             UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
             //保存当前审批用户与业务表的关系
             userapproveService.save(userToken, taskVO, task);
-
-
             return true;
         } catch (Exception e) {
             log.error("e={}", e);