From 36c2449aec5b51e5ed4e5c6841154b746060e09a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 14 九月 2024 12:22:20 +0800
Subject: [PATCH] UI上下文导入接口上传

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
index 769146a..792a964 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java
@@ -1,15 +1,14 @@
 package com.vci.web.controller;
 
-import com.vci.file.pagemodel.VciFileObjectVO;
+import com.vci.dto.ProcessTemplateVO;
+import com.vci.pagemodel.*;
+import com.vci.pagemodel.KeyValue;
 import com.vci.starter.web.annotation.bus.VciNoUseBaseResult;
 import com.vci.starter.web.annotation.controller.VciUnCheckRight;
 import com.vci.starter.web.annotation.log.VciBusinessLog;
 import com.vci.starter.web.annotation.permission.VciReferPermission;
-import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.*;
 import com.vci.starter.web.util.ControllerUtil;
-import com.vci.web.pageModel.*;
-import com.vci.web.pageModel.KeyValue;
 import com.vci.web.service.WebProcessDefineServiceI;
 import com.vci.web.util.WebUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -204,7 +203,7 @@
 	public BaseResult getOutcomes(String taskOid){
 		 List<ProcessOutcomeVO> allOutcomes = proDefineService.getOutCome(taskOid, true);
 		BaseResult result = BaseResult.success();
-		result.setObj(allOutcomes);
+		result.setData(allOutcomes);
 		 if(allOutcomes !=null && allOutcomes.size()>0){
 			 result.setSuccess(true);
 		 }else{
@@ -255,7 +254,9 @@
 		try{
 			List<ProcessNodeVO> allNode = proDefineService.getAllProcessNode(processOid, true,maxSecret);
 			if(allNode!=null && allNode.size()>0){
-				return BaseResult.success(allNode);
+				BaseResult baseResult = BaseResult.success();
+				baseResult.setData(allNode);
+				return baseResult;
 			}else{
 				return BaseResult.fail("鏁版嵁鏈夎锛屾病鎵惧埌娴佺▼鐨勮妭鐐�");
 			}

--
Gitblit v1.9.3