From b911e4068e72eebc444ce5a12a16c2e191f4ee8d Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Mon, 18 Jul 2022 17:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TAbilityApplicationController.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
index 07290c24..90d41bfd 100644
--- a/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
+++ b/renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
@@ -107,6 +107,14 @@ public class TAbilityApplicationController {
                     if (inStanceId == null) {
                         return index;
                     }
+                    ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(inStanceId + "").singleResult();
+                    if (execution != null) {
+                        index.setEnded(execution.isEnded()); // 流程引擎内是否已结束
+                    } else {
+                        if (params.containsKey("ended")) {
+                            index.setEnded(Boolean.valueOf(params.get("ended").toString()));
+                        }
+                    }
                     List<TAbilityApplicationDTO> dtos =
                             tAbilityApplicationService.getByInstanceId(inStanceId + "");
                     if (!dtos.isEmpty()) {
@@ -124,10 +132,6 @@ public class TAbilityApplicationController {
                                     }
                                 });
                     }
-                    ExecutionEntity execution = (ExecutionEntity) runtimeService.createExecutionQuery().executionId(inStanceId + "").singleResult();
-                    if (execution != null) {
-                        index.setEnded(execution.isEnded()); // 流程引擎内是否已结束
-                    }
                     return index;
                 }).collect(Collectors.toList());
         page.setList(list);