From c482d0db65703e92f4addd89e4e28270a0ed631d Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期一, 24 六月 2024 13:57:06 +0800
Subject: [PATCH] 调整返回值
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java | 2 --
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebProcessDefineController.java | 6 ++++--
2 files changed, 4 insertions(+), 4 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..fac4192 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
@@ -204,7 +204,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 +255,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("鏁版嵁鏈夎锛屾病鎵惧埌娴佺▼鐨勮妭鐐�");
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
index 78d98be..09addb7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
@@ -146,8 +146,6 @@
*/
@Override
public BaseResult uploadFile(MultipartFile multipartFile, VciFileObjectDTO fileObjectDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(fileObjectDTO.getFileDocClassify(), "鏂囨。绫诲瀷缂栧彿");
-
String sourceFileName = multipartFile.getOriginalFilename();
String fileExtension = getFileExtension(sourceFileName);
String fileNameNoExtension = getFileNameNoExtension(sourceFileName);
--
Gitblit v1.9.3