add 增加工作流权限标识符

2026-04-23 02:48:34 +08:00 · 2026-03-19 15:42:19 +08:00
parent fbddd6d027
commit c0c8322dbf
6 changed files with 101 additions and 10 deletions
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
@@ -1,5 +1,6 @@
 package org.dromara.workflow.controller;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -45,6 +46,7 @@ public class FlwDefinitionController extends BaseController {
     * @param pageQuery      分页
     */
    @GetMapping("/list")
+    @SaCheckPermission("workflow:definition:list")
    public TableDataInfo<FlowDefinitionVo> list(FlowDefinition flowDefinition, PageQuery pageQuery) {
        return flwDefinitionService.queryList(flowDefinition, pageQuery);
    }
@@ -56,6 +58,7 @@ public class FlwDefinitionController extends BaseController {
     * @param pageQuery      分页
     */
    @GetMapping("/unPublishList")
+    @SaCheckPermission("workflow:definition:list")
    public TableDataInfo<FlowDefinitionVo> unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) {
        return flwDefinitionService.unPublishList(flowDefinition, pageQuery);
    }
@@ -66,6 +69,7 @@ public class FlwDefinitionController extends BaseController {
     * @param id 流程定义id
     */
    @GetMapping(value = "/{id}")
+    @SaCheckPermission("workflow:definition:query")
    public R<Definition> getInfo(@PathVariable Long id) {
        return R.ok(defService.getById(id));
    }
@@ -79,6 +83,7 @@ public class FlwDefinitionController extends BaseController {
    @PostMapping
    @RepeatSubmit()
    @Transactional(rollbackFor = Exception.class)
+    @SaCheckPermission("workflow:definition:add")
    public R<Boolean> add(@RequestBody FlowDefinition flowDefinition) {
        return R.ok(defService.checkAndSave(flowDefinition));
    }
@@ -92,6 +97,7 @@ public class FlwDefinitionController extends BaseController {
    @PutMapping
    @RepeatSubmit()
    @Transactional(rollbackFor = Exception.class)
+    @SaCheckPermission("workflow:definition:edit")
    public R<Boolean> edit(@RequestBody FlowDefinition flowDefinition) {
        return R.ok(defService.updateById(flowDefinition));
    }
@@ -104,6 +110,7 @@ public class FlwDefinitionController extends BaseController {
    @Log(title = "流程定义", businessType = BusinessType.INSERT)
    @PutMapping("/publish/{id}")
    @RepeatSubmit()
+    @SaCheckPermission("workflow:definition:publish")
    public R<Boolean> publish(@PathVariable Long id) {
        return R.ok(flwDefinitionService.publish(id));
    }
@@ -117,6 +124,7 @@ public class FlwDefinitionController extends BaseController {
    @PutMapping("/unPublish/{id}")
    @RepeatSubmit()
    @Transactional(rollbackFor = Exception.class)
+    @SaCheckPermission("workflow:definition:publish")
    public R<Boolean> unPublish(@PathVariable Long id) {
        return R.ok(defService.unPublish(id));
    }
@@ -126,6 +134,7 @@ public class FlwDefinitionController extends BaseController {
     */
    @Log(title = "流程定义", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
+    @SaCheckPermission("workflow:definition:remove")
    public R<Void> remove(@PathVariable List<Long> ids) {
        return toAjax(flwDefinitionService.removeDef(ids));
    }
@@ -139,6 +148,7 @@ public class FlwDefinitionController extends BaseController {
    @PostMapping("/copy/{id}")
    @RepeatSubmit()
    @Transactional(rollbackFor = Exception.class)
+    @SaCheckPermission("workflow:definition:copy")
    public R<Boolean> copy(@PathVariable Long id) {
        return R.ok(defService.copyDef(id));
    }
@@ -151,6 +161,7 @@ public class FlwDefinitionController extends BaseController {
     */
    @Log(title = "流程定义", businessType = BusinessType.IMPORT)
    @PostMapping("/importDef")
+    @SaCheckPermission("workflow:definition:import")
    public R<Boolean> importDef(MultipartFile file, String category) {
        return R.ok(flwDefinitionService.importJson(file, category));
    }
@@ -164,6 +175,7 @@ public class FlwDefinitionController extends BaseController {
     */
    @Log(title = "流程定义", businessType = BusinessType.EXPORT)
    @PostMapping("/exportDef/{id}")
+    @SaCheckPermission("workflow:definition:export")
    public void exportDef(@PathVariable Long id, HttpServletResponse response) throws IOException {
        flwDefinitionService.exportDef(id, response);
    }
@@ -174,6 +186,7 @@ public class FlwDefinitionController extends BaseController {
     * @param id 流程定义id
     */
    @GetMapping("/xmlString/{id}")
+    @SaCheckPermission("workflow:definition:query")
    public R<String> xmlString(@PathVariable Long id) {
        return R.ok("操作成功", defService.exportJson(id));
    }
@@ -188,6 +201,7 @@ public class FlwDefinitionController extends BaseController {
    @PutMapping("/active/{id}")
    @Transactional(rollbackFor = Exception.class)
    @Log(title = "流程定义", businessType = BusinessType.UPDATE)
+    @SaCheckPermission("workflow:definition:active")
    public R<Boolean> active(@PathVariable Long id, @RequestParam boolean active) {
        return R.ok(active ? defService.active(id) : defService.unActive(id));
    }
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
@@ -1,5 +1,6 @@
 package org.dromara.workflow.controller;

+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -46,6 +47,7 @@ public class FlwInstanceController extends BaseController {
     * @param pageQuery      分页
     */
    @GetMapping("/pageByRunning")
+    @SaCheckPermission("workflow:instance:list")
    public TableDataInfo<FlowInstanceVo> selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
        return flwInstanceService.selectRunningInstanceList(flowInstanceBo, pageQuery);
    }
@@ -57,6 +59,7 @@ public class FlwInstanceController extends BaseController {
     * @param pageQuery      分页
     */
    @GetMapping("/pageByFinish")
+    @SaCheckPermission("workflow:instance:list")
    public TableDataInfo<FlowInstanceVo> selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
        return flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery);
    }
@@ -67,6 +70,7 @@ public class FlwInstanceController extends BaseController {
     * @param businessId 业务id
     */
    @GetMapping("/getInfo/{businessId}")
+    @SaCheckPermission("workflow:instance:query")
    public R<FlowInstanceVo> getInfo(@PathVariable Long businessId) {
        return R.ok(flwInstanceService.queryByBusinessId(businessId));
    }
@@ -78,6 +82,7 @@ public class FlwInstanceController extends BaseController {
     */
    @DeleteMapping("/deleteByBusinessIds/{businessIds}")
    @Log(title = "流程实例管理", businessType = BusinessType.DELETE)
+    @SaCheckPermission("workflow:instance:remove")
    public R<Void> deleteByBusinessIds(@PathVariable List<Long> businessIds) {
        return toAjax(flwInstanceService.deleteByBusinessIds(StreamUtils.toList(businessIds, Convert::toStr)));
    }
@@ -89,6 +94,7 @@ public class FlwInstanceController extends BaseController {
     */
    @DeleteMapping("/deleteByInstanceIds/{instanceIds}")
    @Log(title = "流程实例管理", businessType = BusinessType.DELETE)
+    @SaCheckPermission("workflow:instance:remove")
    public R<Void> deleteByInstanceIds(@PathVariable List<Long> instanceIds) {
        return toAjax(flwInstanceService.deleteByInstanceIds(instanceIds));
    }
@@ -100,6 +106,7 @@ public class FlwInstanceController extends BaseController {
     */
    @DeleteMapping("/deleteHisByInstanceIds/{instanceIds}")
    @Log(title = "流程实例管理", businessType = BusinessType.DELETE)
+    @SaCheckPermission("workflow:instance:remove")
    public R<Void> deleteHisByInstanceIds(@PathVariable List<Long> instanceIds) {
        return toAjax(flwInstanceService.deleteHisByInstanceIds(instanceIds));
    }
@@ -112,6 +119,7 @@ public class FlwInstanceController extends BaseController {
    @RepeatSubmit()
    @PutMapping("/cancelProcessApply")
    @Log(title = "流程实例管理", businessType = BusinessType.UPDATE)
+    @SaCheckPermission("workflow:instance:cancel")
    public R<Void> cancelProcessApply(@RequestBody FlowCancelBo bo) {
        return toAjax(flwInstanceService.cancelProcessApply(bo));
    }
@@ -125,6 +133,7 @@ public class FlwInstanceController extends BaseController {
    @RepeatSubmit()
    @PutMapping("/active/{id}")
    @Log(title = "流程实例管理", businessType = BusinessType.UPDATE)
+    @SaCheckPermission("workflow:instance:active")
    public R<Boolean> active(@PathVariable Long id, @RequestParam boolean active) {
        return R.ok(active ? insService.active(id) : insService.unActive(id));
    }
@@ -136,6 +145,7 @@ public class FlwInstanceController extends BaseController {
     * @param pageQuery      分页
     */
    @GetMapping("/pageByCurrent")
+    @SaCheckPermission("workflow:instance:currentList")
    public TableDataInfo<FlowInstanceVo> selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
        return flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery);
    }
@@ -146,6 +156,7 @@ public class FlwInstanceController extends BaseController {
     * @param businessId 业务id
     */
    @GetMapping("/flowHisTaskList/{businessId}")
+    @SaCheckPermission("workflow:instance:query")
    public R<Map<String, Object>> flowHisTaskList(@PathVariable String businessId) {
        return R.ok(flwInstanceService.flowHisTaskList(businessId));
    }
@@ -156,6 +167,7 @@ public class FlwInstanceController extends BaseController {
     * @param instanceId 流程实例id
     */
    @GetMapping("/instanceVariable/{instanceId}")
+    @SaCheckPermission("workflow:instance:variableQuery")
    public R<Map<String, Object>> instanceVariable(@PathVariable Long instanceId) {
        return R.ok(flwInstanceService.instanceVariable(instanceId));
    }
@@ -168,6 +180,7 @@ public class FlwInstanceController extends BaseController {
    @RepeatSubmit()
    @PutMapping("/updateVariable")
    @Log(title = "流程实例管理", businessType = BusinessType.UPDATE)
+    @SaCheckPermission("workflow:instance:variable")
    public R<Void> updateVariable(@Validated @RequestBody FlowVariableBo bo) {
        return toAjax(flwInstanceService.updateVariable(bo));
    }
@@ -180,6 +193,7 @@ public class FlwInstanceController extends BaseController {
    @Log(title = "流程实例管理", businessType = BusinessType.INSERT)
    @RepeatSubmit()
    @PostMapping("/invalid")
+    @SaCheckPermission("workflow:instance:invalid")
    public R<Boolean> invalid(@Validated @RequestBody FlowInvalidBo bo) {
        return R.ok(flwInstanceService.processInvalid(bo));
    }
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
@@ -289,8 +289,11 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
        if (definition == null) {
            throw new ServiceException(ExceptionCons.NOT_FOUNT_DEF);
        }
-        String message = bo.getMessage();
        String userIdStr = LoginHelper.getUserIdStr();
+        if (!LoginHelper.isSuperAdmin() && !instance.getCreateBy().equals(userIdStr)) {
+            throw new ServiceException("权限不足，无法撤销流程!");
+        }
+        String message = bo.getMessage();
        BusinessStatusEnum.checkCancelStatus(instance.getFlowStatus());
        FlowParams flowParams = FlowParams.build()
            .message(message)