diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/ruoyi-common/ruoyi-common-satoken/pom.xml index 5197d8537..8e8e36dcb 100644 --- a/ruoyi-common/ruoyi-common-satoken/pom.xml +++ b/ruoyi-common/ruoyi-common-satoken/pom.xml @@ -11,6 +11,10 @@ ruoyi-common-satoken + + ruoyi-common-satoken 权限认证 + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java index a2748db62..512a1348f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java @@ -108,13 +108,4 @@ public interface FlowConstant { */ String VAR_IGNORE_COOPERATE = "ignoreCooperate"; - /** - * 未删除(正常数据) - */ - Integer NOT_DELETED = 0; - - /** - * 已删除(逻辑删除) - */ - Integer DELETED = 1; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java index 05f14e93e..54bfb8a27 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java @@ -63,7 +63,6 @@ public class FlwSpelController extends BaseController { } /** - * /** * 新增流程 SpEL 表达式定义。 * * @param bo 表达式信息 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index 482bd1165..d992f1e30 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -90,7 +90,6 @@ public class FlwTaskController extends BaseController { } /** - * /** * 查询全部待办任务。 * * @param flowTaskBo 参数 @@ -129,7 +128,6 @@ public class FlwTaskController extends BaseController { } /** - * /** * 根据任务 id 查询任务详情。 * * @param taskId 任务id @@ -141,7 +139,6 @@ public class FlwTaskController extends BaseController { } /** - * /** * 获取流程下一节点信息。 * * @param bo 参数 @@ -153,7 +150,6 @@ public class FlwTaskController extends BaseController { } /** - * /** * 终止流程任务。 * * @param bo 参数 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java index 817096a3d..24159fcad 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java @@ -53,7 +53,6 @@ public class TestLeaveController extends BaseController { } /** - * /** * 导出请假列表。 * * @param bo 查询条件 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java index f55423138..3955d163a 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java @@ -14,7 +14,6 @@ import org.dromara.workflow.common.enums.MessageTypeEnum; import org.dromara.workflow.domain.FlowInstanceBizExt; import org.dromara.workflow.domain.bo.CompleteTaskBo; import org.dromara.workflow.domain.bo.StartProcessBo; -import org.dromara.workflow.service.IFlwDefinitionService; import org.dromara.workflow.service.IFlwInstanceService; import org.dromara.workflow.service.IFlwTaskService; import org.springframework.stereotype.Service; @@ -35,7 +34,6 @@ import java.util.Map; public class WorkflowServiceImpl implements WorkflowService { private final IFlwInstanceService flwInstanceService; - private final IFlwDefinitionService flwDefinitionService; private final IFlwTaskService flwTaskService; /**