|
|
@ -660,10 +660,9 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce |
|
|
|
for (TaskInstance taskInstance : taskInstanceList) { |
|
|
|
for (TaskInstance taskInstance : taskInstanceList) { |
|
|
|
TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMapper.queryByDefinitionCodeAndVersion( |
|
|
|
TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMapper.queryByDefinitionCodeAndVersion( |
|
|
|
taskInstance.getTaskCode(), taskInstance.getTaskDefinitionVersion()); |
|
|
|
taskInstance.getTaskCode(), taskInstance.getTaskDefinitionVersion()); |
|
|
|
String parameter = taskDefinitionLog.getTaskParams(); |
|
|
|
|
|
|
|
Map<String, String> map = JSONUtils.toMap(parameter); |
|
|
|
String localParams = JSONUtils.getNodeString(taskDefinitionLog.getTaskParams(), LOCAL_PARAMS); |
|
|
|
String localParams = map.get(LOCAL_PARAMS); |
|
|
|
if (StringUtils.isNotEmpty(localParams)) { |
|
|
|
if (localParams != null && !localParams.isEmpty()) { |
|
|
|
|
|
|
|
localParams = ParameterUtils.convertParameterPlaceholders(localParams, timeParams); |
|
|
|
localParams = ParameterUtils.convertParameterPlaceholders(localParams, timeParams); |
|
|
|
List<Property> localParamsList = JSONUtils.toList(localParams, Property.class); |
|
|
|
List<Property> localParamsList = JSONUtils.toList(localParams, Property.class); |
|
|
|
|
|
|
|
|
|
|
@ -674,7 +673,6 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce |
|
|
|
localUserDefParams.put(taskDefinitionLog.getName(), localParamsMap); |
|
|
|
localUserDefParams.put(taskDefinitionLog.getName(), localParamsMap); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
return localUserDefParams; |
|
|
|
return localUserDefParams; |
|
|
|
} |
|
|
|
} |
|
|
|