wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-09-26 16:39:55 +08:00
parent 16ee9172be 128653d837
commit c98509adc0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -295,6 +295,7 @@ public class TAbilityApplicationController {
}
boolean finalBackToFirst = backToFirst;
List<HistoryDetailDTO> finalTaskHandleDetailInfo = taskHandleDetailInfo;
return new HashMap<String, Object>() {
{
put("instanceId", tAbilityApplicationDTOList.get(0).getInstanceId()); // 流程id
@ -305,7 +306,7 @@ public class TAbilityApplicationController {
} else {
put("ended", true);
}
put("taskHandleDetailInfo", taskHandleDetailInfo); // 流程详情
put("taskHandleDetailInfo", finalTaskHandleDetailInfo); // 流程详情
put("approveStatus", tAbilityApplicationDTOList.get(0).getApproveStatus());
if (!finalCamera.isEmpty()) {
put("camera", finalCamera); // 流程详情