feat: 提交人权限-允许撤销审批中的申请
This commit is contained in:
@@ -62,4 +62,7 @@ public class BpmModelMetaInfoVO {
|
||||
@Schema(description = "排序", example = "1")
|
||||
private Long sort; // 创建时,后端自动生成
|
||||
|
||||
@Schema(description = "允许撤销审批中的申请")
|
||||
private Boolean allowCancelRunningProcess;
|
||||
|
||||
}
|
||||
|
||||
@@ -150,4 +150,10 @@ public class BpmProcessDefinitionInfoDO extends BaseDO {
|
||||
@TableField(typeHandler = StringListTypeHandler.class) // 为了可以使用 find_in_set 进行过滤
|
||||
private List<Long> managerUserIds;
|
||||
|
||||
/**
|
||||
* 允许撤销审批中的申请
|
||||
* TODO @芋艿 需要同步修改数据库字段
|
||||
*/
|
||||
private Boolean allowCancelRunningProcess;
|
||||
|
||||
}
|
||||
|
||||
@@ -642,6 +642,13 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
|
||||
if (!Objects.equals(instance.getStartUserId(), String.valueOf(userId))) {
|
||||
throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF);
|
||||
}
|
||||
// 1.3 校验允许撤销审批中的申请
|
||||
BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(instance.getProcessDefinitionId());
|
||||
Assert.notNull(processDefinitionInfo, "流程定义({})不存在", processDefinitionInfo);
|
||||
if (processDefinitionInfo.getAllowCancelRunningProcess() != null // 防止未配置 AllowCancelRunningProcess , 默认为可取消
|
||||
&& !processDefinitionInfo.getAllowCancelRunningProcess()) {
|
||||
throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_ALLOW);
|
||||
}
|
||||
|
||||
// 2. 取消流程
|
||||
updateProcessInstanceCancel(cancelReqVO.getId(),
|
||||
|
||||
Reference in New Issue
Block a user