Merge remote-tracking branch 'origin/master'

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<Boolean> updateTaskStatus(@RequestParam(value = "waylineId",required = false) String waylineId,@RequestParam(value =  "status",required = false) String status,
+    public R<Boolean> updateTaskStatus(@RequestParam String waylineId,
-                                          @RequestParam(value = "jobId",required = false)String jobId,@RequestParam(value = "jobName",required = false) String jobName) {
+                                       @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结束---------------------");

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,
+    void updateTaskStatus(@RequestParam String waylineId,
-                          @RequestParam("jobId")String jobId, @RequestParam("jobName") String jobName);
+                          @RequestParam String status,
+                          @RequestParam(required = false) String jobId,
+                          @RequestParam(required = false) String jobName);
 }

dk-modules/workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java

@@ -37,9 +37,18 @@ public class WorkflowPermissionHandler implements PermissionHandler {
     @Override
     public List<String> permissions() {
         LoginUser loginUser = LoginHelper.getLoginUser();
+
+        List<String> resultList = new ArrayList<>();
+        //如果为空则将管理员放进去
+        resultList.add("1");
+        resultList.add("dept:100");
+
+        resultList.add("${handler}");
+
         if (ObjectUtil.isNull(loginUser)) {
-            return new ArrayList<>();
+            return resultList;
         }
+
         // 使用一个流来构建权限列表
         List<String> permissionList = Stream.of(
                 // 角色权限前缀
@@ -59,10 +68,11 @@ public class WorkflowPermissionHandler implements PermissionHandler {
             .flatMap(stream -> stream)
             .collect(Collectors.toList());
 
-        permissionList.add("${handler}");
+        resultList.addAll(permissionList);
-        return permissionList;
+        return resultList;
     }
 
+
     /**
      * 获取当前办理人
      *