Merge branch 'develop' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into develop

backend/inz.workflow/src/main/java/com/beecode/inz/workflow/internal/service/InzWorkflowServiceImpl.java

@@ -221,7 +221,7 @@ public class InzWorkflowServiceImpl implements InzWorkflowService{
 	@Override
 	public void startWorkflow(String actionName, String bizTypeName, String bizObjectName, String bizProcessName,
 			KObject bizData, Map<String, Object> params) throws WorkflowRuntimeException {
-		startWorkflow(actionName, bizTypeName, bizObjectName, bizProcessName, bizData, null,null);
+		startWorkflow(actionName, bizTypeName, bizObjectName, bizProcessName, bizData, params,null);
 	}
 
 	@Transactional

backend/inz.workflow/src/main/java/com/beecode/inz/workflow/util/WorkflowGenerator.java

@@ -590,14 +590,14 @@ public class WorkflowGenerator {
 		equipCount.put("type", "int");
 		
 		JSONObject regionalCompanyCode = new JSONObject();
-		totalValue.put("name", "regionalCompanyCode");
-		totalValue.put("key", "regionalCompanyCode");
-		totalValue.put("type", "String");
+		regionalCompanyCode.put("name", "regionalCompanyCode");
+		regionalCompanyCode.put("key", "regionalCompanyCode");
+		regionalCompanyCode.put("type", "string");
 		
 		JSONObject regionalCompanyName = new JSONObject();
-		totalValue.put("name", "regionalCompanyName");
-		totalValue.put("key", "regionalCompanyName");
-		totalValue.put("type", "String");
+		regionalCompanyName.put("name", "regionalCompanyName");
+		regionalCompanyName.put("key", "regionalCompanyName");
+		regionalCompanyName.put("type", "string");
 		
 		array.put(arg1);
 		array.put(arg2);