From a78216b8655bbfd4d70577d21729e9741eb021d5 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期三, 05 七月 2023 17:25:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
index e9ec1fd..b01bb9d 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
@@ -62,6 +62,8 @@
 	private final ProcessStageAttrService processStageAttrService;
 
 	private static String MODELKEY = "modelKey";//鍓嶇浼犺繃鏉ョ殑妯″瀷key
+	private static String TASKID = "taskId";//鍓嶇浼犺繃鏉ョ殑妯″瀷key
+	private static String PROCESSINSTANCEID = "processInstanceId";//鍓嶇浼犺繃鏉ョ殑妯″瀷key
 	@Override
 	public R<BladeFlow> startProcess(FlowTaskDTO flowTaskUserC){
 		Map<String, Object> kvv = flowTaskUserC.getVariables();
@@ -228,16 +230,10 @@
 			flowTaskDTO.setVariables(variables);
 		}
 
-		String templateId = variables.get("templateId").toString();
-		//娴佺▼闃舵
-		Map<String, Object> m = new HashMap<>();
-		m.put("template_id", templateId);
-		m.put("task_id", crruentActivityId);
-		m.put("model_key", modelKey);
-		QueryWrapper q = Condition.getQueryWrapper(m, ProcessStageAttr.class)
-			.select("attr_id attrId,attr_name attrName,attr_group attrGroup");
-		List<ProcessStageAttr> stageAttrs = processStageAttrService.list(q);
-		flowTaskDTO.setStageAttrs(stageAttrs);
+
+		//鏀惧叆娴佺▼闃舵銆佹祦绋媘odelkey
+		variables.put(TASKID,crruentActivityId);
+		variables.put(PROCESSINSTANCEID,processInstanceId);
 		return flowTaskDTO;
 	}
 }

--
Gitblit v1.9.3