Merge remote-tracking branch 'origin/test' into test

1 year ago · d5ff40103c
parent c4ac1eac4b 7f0fde987e
commit d5ff40103c
1 changed files with 1 additions and 1 deletions
--- 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
@ -586,10 +586,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                childPicture.setTaskId(String.join(",", taskIds));
                childPicture.setTaskname(String.join(",", taskNames));
            } else {
-                taskData = taskList.get(0);
                childPicture.setTaskId(taskData.getId());
                childPicture.setTaskname(taskData.getName());
            }
+            taskData = taskList.get(0);
        }
        if (ObjectUtils.isEmpty(taskData)) {
            model.setFinishtime(System.currentTimeMillis());