diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java index 1f34056..946e59a 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java +++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java @@ -111,8 +111,10 @@ public class BusinessTaskController extends BaseController { @PostMapping("/update/status") - public R updateTaskStatus(@RequestParam(value = "waylineId",required = false) String waylineId,@RequestParam(value = "status",required = false) String status, - @RequestParam(value = "jobId",required = false)String jobId,@RequestParam(value = "jobName",required = false) String jobName) { + public R updateTaskStatus(@RequestParam String waylineId, + @RequestParam String status, + @RequestParam(required = false) String jobId, + @RequestParam(required = false) String jobName) { log.info("----------------------------开始调用feign---------------------"); Boolean updateTaskStatus = businessTaskService.updateTaskStatus(waylineId, status, jobId, jobName); log.info("----------------------------调用feign结束---------------------"); diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java b/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java index f77e0f1..2fa1388 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/fegin/RemoteBusinessTaskFeign.java @@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.RequestParam; public interface RemoteBusinessTaskFeign { @PostMapping("/update/status") - void updateTaskStatus(@RequestParam("waylineId") String waylineId, @RequestParam("status") String status, - @RequestParam("jobId")String jobId, @RequestParam("jobName") String jobName); + void updateTaskStatus(@RequestParam String waylineId, + @RequestParam String status, + @RequestParam(required = false) String jobId, + @RequestParam(required = false) String jobName); } diff --git a/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java b/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java index 9fbe450..0a06ce4 100644 --- a/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java +++ b/dk-modules/workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java @@ -37,9 +37,18 @@ public class WorkflowPermissionHandler implements PermissionHandler { @Override public List permissions() { LoginUser loginUser = LoginHelper.getLoginUser(); + + List resultList = new ArrayList<>(); + //如果为空则将管理员放进去 + resultList.add("1"); + resultList.add("dept:100"); + + resultList.add("${handler}"); + if (ObjectUtil.isNull(loginUser)) { - return new ArrayList<>(); + return resultList; } + // 使用一个流来构建权限列表 List permissionList = Stream.of( // 角色权限前缀 @@ -59,10 +68,11 @@ public class WorkflowPermissionHandler implements PermissionHandler { .flatMap(stream -> stream) .collect(Collectors.toList()); - permissionList.add("${handler}"); - return permissionList; + resultList.addAll(permissionList); + return resultList; } + /** * 获取当前办理人 *