BruceSun
/
SAMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!5 流程设计导入成功返回的状态码不对 

Merge pull request !5 from 马铃薯头/master
rf
tony 2023-03-09 07:38:59 +00:00 committed by Gitee
parent bd47623b68 07053bcd7c
commit b55c563811
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowDefinitionController.java
View File

@ -4,10 +4,9 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.FlowProcDefDto;
import com.ruoyi.flowable.domain.dto.FlowSaveXmlVo; import com.ruoyi.flowable.domain.dto.FlowSaveXmlVo;
import com.ruoyi.flowable.service.IFlowDefinitionService; import com.ruoyi.flowable.service.IFlowDefinitionService;
import com.ruoyi.system.domain.FlowProcDefDto;
import com.ruoyi.system.domain.SysExpression; import com.ruoyi.system.domain.SysExpression;
import com.ruoyi.system.service.ISysExpressionService; import com.ruoyi.system.service.ISysExpressionService;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
@ -17,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -141,7 +139,7 @@ public class FlowDefinitionController extends BaseController {
flowDefinitionService.importFile(vo.getName(), vo.getCategory(), in); flowDefinitionService.importFile(vo.getName(), vo.getCategory(), in);
} catch (Exception e) { } catch (Exception e) {
log.error("导入失败:", e); log.error("导入失败:", e);
return AjaxResult.success(e.getMessage()); return AjaxResult.error(e.getMessage());
} finally { } finally {
try { try {
if (in != null) { if (in != null) {
@ -202,4 +200,4 @@ public class FlowDefinitionController extends BaseController {
return AjaxResult.success(list); return AjaxResult.success(list);
} }
} }