diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index 158d4279..037c026e 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -126,6 +126,7 @@ security: - /facility/matrix/** - /**/changxie/callback/** - /gps/equipment/dataAcceptance + - /resource/oss/upload # 多租户配置 tenant: diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java index 9c324f43..542a82e5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java @@ -137,27 +137,27 @@ public class WorkflowGlobalListener implements GlobalListener { if (flowTask.getNodeCode().equals(applyNodeCode)) { flowTask.setPermissionList(List.of(instance.getCreateBy())); } -// String nodeCode = flowTask.getNodeCode(); -// // 查询节点信息 -// FlowNode byNodeCode = flwTaskService.getByNodeCode(nodeCode, definition.getId()); -// // 获取原来的办理人信息 -// List originalPermissionList = flowTask.getPermissionList(); -// log.info("节点 {} 原来的办理人信息: {}", nodeCode, originalPermissionList); -// String permissionFlag = byNodeCode.getPermissionFlag(); -// try { -// if (permissionFlag.contains("role")) { -// permissionFlag = permissionFlag.replace("@@", ","); -// -// String flowCode = definition.getFlowCode(); -// String projectId = flowCode.split("_")[0]; -// -// List userDTOS = flwTaskAssigneeService.fetchUsersByStorageIds(permissionFlag, Long.valueOf(projectId)); -// -// flowTask.setPermissionList(userDTOS.stream().map(UserDTO::getUserId).map(String::valueOf).collect(Collectors.toList())); -// } -// } catch (Exception e) { -// log.error("设置失败: {}", e.getMessage()); -// } + String nodeCode = flowTask.getNodeCode(); + // 查询节点信息 + FlowNode byNodeCode = flwTaskService.getByNodeCode(nodeCode, definition.getId()); + // 获取原来的办理人信息 + List originalPermissionList = flowTask.getPermissionList(); + log.info("节点 {} 原来的办理人信息: {}", nodeCode, originalPermissionList); + String permissionFlag = byNodeCode.getPermissionFlag(); + try { + if (permissionFlag.contains("role")) { + permissionFlag = permissionFlag.replace("@@", ","); + + String flowCode = definition.getFlowCode(); + String projectId = flowCode.split("_")[0]; + + List userDTOS = flwTaskAssigneeService.fetchUsersByStorageIds(permissionFlag, Long.valueOf(projectId)); + + flowTask.setPermissionList(userDTOS.stream().map(UserDTO::getUserId).map(String::valueOf).collect(Collectors.toList())); + } + } catch (Exception e) { + log.error("设置失败: {}", e.getMessage()); + } } }