From ad9132e8578730612a68df698dcc402b16b4ebfe Mon Sep 17 00:00:00 2001 From: konbai <1527468660@qq.com> Date: Sat, 23 Jul 2022 21:31:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=8A=9E=E5=85=AC=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9D=83=E9=99=90=E6=8C=89=E9=92=AE=E6=A0=87?= =?UTF-8?q?=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/workflow/WfTaskController.java | 14 +++++++ ruoyi-ui/src/views/workflow/model/index.vue | 4 +- ruoyi-ui/src/views/workflow/work/claim.vue | 1 + ruoyi-ui/src/views/workflow/work/copy.vue | 3 +- ruoyi-ui/src/views/workflow/work/finished.vue | 4 +- ruoyi-ui/src/views/workflow/work/own.vue | 37 +++++++++++-------- ruoyi-ui/src/views/workflow/work/todo.vue | 3 +- 7 files changed, 45 insertions(+), 21 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java index 57cd5e17..660269e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.workflow; +import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.core.domain.R; import com.ruoyi.workflow.domain.bo.WfTaskBo; @@ -37,6 +38,7 @@ public class WfTaskController { @ApiOperation(value = "取消申请", response = WfTaskVo.class) @PostMapping(value = "/stopProcess") + @SaCheckPermission("workflow:process:cancel") public R stopProcess(@RequestBody WfTaskBo bo) { flowTaskService.stopProcess(bo); return R.ok(); @@ -44,6 +46,7 @@ public class WfTaskController { @ApiOperation(value = "撤回流程", response = WfTaskVo.class) @PostMapping(value = "/revokeProcess") + @SaCheckPermission("workflow:process:revoke") public R revokeProcess(@RequestBody WfTaskBo bo) { flowTaskService.revokeProcess(bo); return R.ok(); @@ -51,12 +54,14 @@ public class WfTaskController { @ApiOperation(value = "获取流程变量", response = WfTaskVo.class) @GetMapping(value = "/processVariables/{taskId}") + @SaCheckPermission("workflow:process:query") public R processVariables(@ApiParam(value = "流程任务Id") @PathVariable(value = "taskId") String taskId) { return R.ok(flowTaskService.getProcessVariables(taskId)); } @ApiOperation(value = "审批任务") @PostMapping(value = "/complete") + @SaCheckPermission("workflow:process:approval") public R complete(@RequestBody WfTaskBo bo) { flowTaskService.complete(bo); return R.ok(); @@ -65,6 +70,7 @@ public class WfTaskController { @ApiOperation(value = "驳回任务") @PostMapping(value = "/reject") + @SaCheckPermission("workflow:process:approval") public R taskReject(@RequestBody WfTaskBo bo) { flowTaskService.taskReject(bo); return R.ok(); @@ -72,6 +78,7 @@ public class WfTaskController { @ApiOperation(value = "退回任务") @PostMapping(value = "/return") + @SaCheckPermission("workflow:process:approval") public R taskReturn(@RequestBody WfTaskBo bo) { flowTaskService.taskReturn(bo); return R.ok(); @@ -79,12 +86,14 @@ public class WfTaskController { @ApiOperation(value = "获取所有可回退的节点") @PostMapping(value = "/returnList") + @SaCheckPermission("workflow:process:query") public R findReturnTaskList(@RequestBody WfTaskBo bo) { return R.ok(flowTaskService.findReturnTaskList(bo)); } @ApiOperation(value = "删除任务") @DeleteMapping(value = "/delete") + @SaCheckPermission("workflow:process:approval") public R delete(@RequestBody WfTaskBo bo) { flowTaskService.deleteTask(bo); return R.ok(); @@ -92,6 +101,7 @@ public class WfTaskController { @ApiOperation(value = "认领/签收任务") @PostMapping(value = "/claim") + @SaCheckPermission("workflow:process:claim") public R claim(@RequestBody WfTaskBo bo) { flowTaskService.claim(bo); return R.ok(); @@ -99,6 +109,7 @@ public class WfTaskController { @ApiOperation(value = "取消认领/签收任务") @PostMapping(value = "/unClaim") + @SaCheckPermission("workflow:process:claim") public R unClaim(@RequestBody WfTaskBo bo) { flowTaskService.unClaim(bo); return R.ok(); @@ -106,6 +117,7 @@ public class WfTaskController { @ApiOperation(value = "委派任务") @PostMapping(value = "/delegate") + @SaCheckPermission("workflow:process:approval") public R delegate(@RequestBody WfTaskBo bo) { if (ObjectUtil.hasNull(bo.getTaskId(), bo.getUserId())) { return R.fail("参数错误！"); @@ -116,6 +128,7 @@ public class WfTaskController { @ApiOperation(value = "转办任务") @PostMapping(value = "/transfer") + @SaCheckPermission("workflow:process:approval") public R transfer(@RequestBody WfTaskBo bo) { if (ObjectUtil.hasNull(bo.getTaskId(), bo.getUserId())) { return R.fail("参数错误！"); @@ -126,6 +139,7 @@ public class WfTaskController { @ApiOperation(value = "获取下一节点") @PostMapping(value = "/nextFlowNode") + @SaCheckPermission("workflow:process:query") public R getNextFlowNode(@RequestBody WfTaskBo bo) { WfNextDto wfNextDto = flowTaskService.getNextFlowNode(bo); return wfNextDto != null ? R.ok(wfNextDto) : R.ok("流程已完结", null); diff --git a/ruoyi-ui/src/views/workflow/model/index.vue b/ruoyi-ui/src/views/workflow/model/index.vue index 03845d1c..75eb59b8 100644 --- a/ruoyi-ui/src/views/workflow/model/index.vue +++ b/ruoyi-ui/src/views/workflow/model/index.vue @@ -129,7 +129,7 @@ 流程图 设为最新 diff --git a/ruoyi-ui/src/views/workflow/work/claim.vue b/ruoyi-ui/src/views/workflow/work/claim.vue index 06e722da..1738b81d 100644 --- a/ruoyi-ui/src/views/workflow/work/claim.vue +++ b/ruoyi-ui/src/views/workflow/work/claim.vue @@ -44,6 +44,7 @@ type="text" icon="el-icon-s-claim" @click="handleClaim(scope.row)" + v-hasPermi="['workflow:process:claim']" >签收 diff --git a/ruoyi-ui/src/views/workflow/work/copy.vue b/ruoyi-ui/src/views/workflow/work/copy.vue index ae42415a..a2eb842d 100644 --- a/ruoyi-ui/src/views/workflow/work/copy.vue +++ b/ruoyi-ui/src/views/workflow/work/copy.vue @@ -31,7 +31,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['workflow:copy:export']" + v-hasPermi="['workflow:process:export']" >导出 @@ -55,6 +55,7 @@ type="text" icon="el-icon-tickets" @click="handleFlowRecord(scope.row)" + v-hasPermi="['workflow:process:query']" >详情 diff --git a/ruoyi-ui/src/views/workflow/work/finished.vue b/ruoyi-ui/src/views/workflow/work/finished.vue index 487bb269..8ea8e2a2 100644 --- a/ruoyi-ui/src/views/workflow/work/finished.vue +++ b/ruoyi-ui/src/views/workflow/work/finished.vue @@ -33,7 +33,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['system:deployment:remove']" + v-hasPermi="['workflow:process:remove']" >删除 @@ -59,12 +59,14 @@ type="text" icon="el-icon-tickets" @click="handleFlowRecord(scope.row)" + v-hasPermi="['workflow:process:query']" >流转记录 撤回 diff --git a/ruoyi-ui/src/views/workflow/work/own.vue b/ruoyi-ui/src/views/workflow/work/own.vue index e5efd064..9cdb8bee 100644 --- a/ruoyi-ui/src/views/workflow/work/own.vue +++ b/ruoyi-ui/src/views/workflow/work/own.vue @@ -74,22 +74,27 @@ diff --git a/ruoyi-ui/src/views/workflow/work/todo.vue b/ruoyi-ui/src/views/workflow/work/todo.vue index 49c32a21..05549176 100644 --- a/ruoyi-ui/src/views/workflow/work/todo.vue +++ b/ruoyi-ui/src/views/workflow/work/todo.vue @@ -62,7 +62,8 @@ type="text" icon="el-icon-edit-outline" @click="handleProcess(scope.row)" - >处理 + v-hasPermi="['workflow:process:approval']" + >办理