From f33a4270f63b97359dd93062f861fc06f420ec99 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Thu, 3 Apr 2025 13:35:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=B7=A5=E5=8D=95feign=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/business/controller/BusinessTaskController.java | 6 ++++-- .../org/dromara/sample/fegin/RemoteBusinessTaskFeign.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) 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..685b727 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); } From bc198e90b091cc8c03c29081bacee9439fd987d7 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Thu, 3 Apr 2025 14:08:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=B7=A5=E5=8D=95feign=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/business/controller/BusinessTaskController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 685b727..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,8 @@ public class BusinessTaskController extends BaseController { @PostMapping("/update/status") - public R updateTaskStatus(@RequestParam String waylineId, // 必传 - @RequestParam String status, // 必传 + public R updateTaskStatus(@RequestParam String waylineId, + @RequestParam String status, @RequestParam(required = false) String jobId, @RequestParam(required = false) String jobName) { log.info("----------------------------开始调用feign---------------------"); From 633fea4c20c04dd33822f3b61b3cc0fe86777b92 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Thu, 3 Apr 2025 14:45:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=B8=8D=E6=98=AF=E9=80=9A=E8=BF=87=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=9B=E5=BB=BA=E5=88=99=E9=BB=98=E8=AE=A4=E5=B0=86?= =?UTF-8?q?=E8=B6=85=E7=AE=A1=E6=94=BE=E8=BF=9B=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/WorkflowPermissionHandler.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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; } + /** * 获取当前办理人 *