From 1531d85695c914b634c993a7ea3c31ad093e300c Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Thu, 23 Jun 2022 20:33:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E7=9A=84=E5=BE=85=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activiti/service/ActTaskService.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
index ca15894b..6a82fb4f 100644
--- a/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
+++ b/renren-admin/src/main/java/io/renren/modules/activiti/service/ActTaskService.java
@@ -10,6 +10,8 @@ import io.renren.common.utils.MessageUtils;
 import io.renren.modules.activiti.dto.TaskDTO;
 import io.renren.modules.demanData.dto.TDemandDataDTO;
 import io.renren.modules.demanData.service.TDemandDataService;
+import io.renren.modules.demandComment.dto.TDemandCommentDTO;
+import io.renren.modules.demandComment.service.TDemandCommentService;
 import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
 import io.renren.modules.processForm.service.TAbilityApplicationService;
 import io.renren.modules.resource.dto.ResourceDTO;
@@ -62,6 +64,9 @@ public class ActTaskService extends BaseServiceImpl {
     public static String Task_HANDLE_STATE_BACK = "back";             //回退
     public static String Task_HANDLE_STATE_STOP = "stop";             //终止
 
+    @Autowired
+    private TDemandCommentService tDemandCommentService;
+
     @Autowired
     protected TaskService taskService;
     @Autowired
@@ -166,6 +171,16 @@ public class ActTaskService extends BaseServiceImpl {
                 listDto.add(dto);
                 continue;
             }
+
+            TDemandCommentDTO tDemandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey()));
+            if (tDemandCommentDTO != null) {
+                Map<String, Object> variables = oMapper.convertValue(tDemandCommentDTO, Map.class);
+                processVariable.putAll(variables);
+                processVariable.putAll(task.getProcessVariables());
+                dto.setParams(processVariable);
+                listDto.add(dto);
+                continue;
+            }
         }
         return new PageData<>(listDto, (int) taskQuery.count());
     }