Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -455,18 +455,18 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             runtimeService.createChangeActivityStateBuilder()
                     .processInstanceId(task.getProcessInstanceId())
                     .moveActivityIdsToSingleActivityId(currentIds, flowTaskVo.getTargetKey()).changeState();
-            String currentTaskId = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).singleResult().getId();
+
             List<HistoricTaskInstance> htiList = historyService.createHistoricTaskInstanceQuery()
                     .processInstanceId(task.getProcessInstanceId()).taskDefinitionKey(flowTaskVo.getTargetKey())
                     .list();
-            String taskAssignee = "";
-            for (HistoricTaskInstance hti: htiList) {
-                if (!hti.getId().equals(currentTaskId)) {
-                    taskAssignee = hti.getAssignee();
-                    break;
+            List<Task> currentTaskList = taskService.createTaskQuery().processInstanceId(task.getProcessInstanceId()).list();
+            for (int i = 0; i < currentTaskList.size(); i++) {
+                String taskAssignee = "";
+                if (!htiList.get(i).getId().equals(currentTaskList.get(i).getId())) {
+                    taskAssignee = htiList.get(i).getAssignee();
+                    taskService.setAssignee(currentTaskList.get(i).getId(), taskAssignee);
                 }
             }
-            taskService.setAssignee(currentTaskId, taskAssignee);
         } catch (FlowableObjectNotFoundException e) {
             throw new CustomException("未找到流程实例，流程可能已发生变化");
         } catch (FlowableException e) {
@@ -1768,7 +1768,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
         }
         if (flowTaskDto.getProcDefName().equals("保证金审批")) {
             CmcDeposit cmcDeposit = cmcDepositService.selectCmcDepositByDepositId(formId);
-            projectId = cmcDeposit != null ? cmcDeposit.getTenderId().toString() : "";
+            if (cmcDeposit != null) {
+                if (cmcDeposit.getTenderId() != null)
+                    projectId = cmcDeposit.getTenderId().toString();
+                else
+                    flowTaskDto.setTitle(cmcDeposit.getApplyReason());
+            }
         }
         if (flowTaskDto.getProcDefName().equals("项目委外")) {
             CmcOutsource cmcOutsource = cmcOutsourceService.selectCmcOutsourceByOutsourceId(formId);