From 0e0e9b59aca7cf3bafb16e5b3a41810100a6d8d1 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Date: Thu, 18 Apr 2019 17:12:23 +0800
Subject: [PATCH 1/2] api access token dev update

---
 .../cn/escheduler/dao/mapper/AccessTokenMapperProvider.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java
index a2b69d5cc1..2e4f92f79b 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapperProvider.java
@@ -80,7 +80,7 @@ public class AccessTokenMapperProvider {
                 SET("`expire_time`=#{accessToken.expireTime}");
                 SET("`update_time`=#{accessToken.updateTime}");
 
-                WHERE("`id`=#{user.id}");
+                WHERE("`id`=#{accessToken.id}");
             }
         }.toString();
     }

From 711dd38130b669b86ea85236840b4811e4f935f9 Mon Sep 17 00:00:00 2001
From: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Date: Fri, 19 Apr 2019 14:06:02 +0800
Subject: [PATCH 2/2] viewVariables api update

---
 .../cn/escheduler/api/service/ProcessInstanceService.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java
index 6c3f2d8f10..54719f90f4 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java
@@ -509,7 +509,7 @@ public class ProcessInstanceService extends BaseDAGService {
         }
 
         // local params
-        Map<String, List<Property>> localUserDefParams = new HashMap<>();
+        Map<String, Map<String,Object>> localUserDefParams = new HashMap<>();
         for (TaskNode taskNode : taskNodeList) {
             String parameter = taskNode.getParams();
             Map<String, String> map = JSONUtils.toMap(parameter);
@@ -517,8 +517,11 @@ public class ProcessInstanceService extends BaseDAGService {
             if (localParams != null && !localParams.isEmpty()) {
                 localParams = ParameterUtils.convertParameterPlaceholders(localParams, timeParams);
                 List<Property> localParamsList = JSON.parseArray(localParams, Property.class);
+                Map<String,Object> localParamsMap = new HashMap<>();
+                localParamsMap.put("taskType",taskNode.getType());
+                localParamsMap.put("localParamsList",localParamsList);
                 if (localParamsList.size() > 0) {
-                    localUserDefParams.put(taskNode.getName(), localParamsList);
+                    localUserDefParams.put(taskNode.getName(), localParamsMap);
                 }
             }