From fd9a6a46664b241f3bddca8a61079ee8eed0ab8d Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Tue, 16 Apr 2024 19:41:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/jyjz/flowable/controller/FlowTaskController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java index 0173372e..39448850 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/controller/FlowTaskController.java @@ -142,6 +142,7 @@ public class FlowTaskController extends BaseController { @PostMapping("/completeFlow") @ResponseBody public ResultVo complete(@RequestBody FlowApprove approve, HttpServletRequest request) { + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); Integer flag = flowTaskService.complete(approve, userToken, Arrays.asList(approve.getFlowTaskInfoList().get(0).getFormId())); return flag > 0 ? ResultVoUtil.success() : ResultVoUtil.error(); @@ -156,6 +157,11 @@ public class FlowTaskController extends BaseController { @PostMapping("/completeBatchFlow") @ResponseBody public ResultVo completeBatch(@RequestBody FlowApprove approve, HttpServletRequest request) { + String tenantId = request.getHeader("X-Tenant-Id"); + if(StringUtils.isBlank(tenantId)){ + return ResultVoUtil.error("租户主键不能为空"); + } + approve.setDeptid(tenantId); UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request)); //任务ID List flowTaskInfoList = approve.getFlowTaskInfoList();