【功能评审】Bpm：发起人是否允许撤销

YunaiV
1 parent 480ed8db
Showing 3 changed files with 3 additions and 4 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
@@ -62,7 +62,7 @@ public class BpmModelMetaInfoVO {
     @Schema(description = "排序", example = "1")
     private Long sort; // 创建时，后端自动生成
-    @Schema(description = "允许撤销审批中的申请")
+    @Schema(description = "允许撤销审批中的申请", example = "true")
     private Boolean allowCancelRunningProcess;
 }
@@ -151,8 +151,7 @@ public class BpmProcessDefinitionInfoDO extends BaseDO {
     private List<Long> managerUserIds;
     /**
-     * 允许撤销审批中的申请
-     * TODO @芋艿 需要同步修改数据库字段
+     * 是否允许撤销审批中的申请
      */
     private Boolean allowCancelRunningProcess;
@@ -646,7 +646,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService 
         BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(instance.getProcessDefinitionId());
         Assert.notNull(processDefinitionInfo, "流程定义({})不存在", processDefinitionInfo);
         if (processDefinitionInfo.getAllowCancelRunningProcess() != null // 防止未配置 AllowCancelRunningProcess , 默认为可取消
-                && !processDefinitionInfo.getAllowCancelRunningProcess()) {
+                && Boolean.FALSE.equals(processDefinitionInfo.getAllowCancelRunningProcess())) {
             throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_ALLOW);
         }