lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码合并

Browse Source
This commit is contained in:
罗成
2025-08-29 22:37:56 +08:00
parent 971c8c277d
commit 3f79a955b3
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xinnengyuan/ruoyi-admin/src/main/resources/application.yml
View File

@ -126,6 +126,7 @@ security:
- /facility/matrix/** - /facility/matrix/**
- /**/changxie/callback/** - /**/changxie/callback/**
- /gps/equipment/dataAcceptance - /gps/equipment/dataAcceptance
- /resource/oss/upload
# 多租户配置 # 多租户配置
tenant: tenant:

42
xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
View File

@ -137,27 +137,27 @@ public class WorkflowGlobalListener implements GlobalListener {
if (flowTask.getNodeCode().equals(applyNodeCode)) { if (flowTask.getNodeCode().equals(applyNodeCode)) {
flowTask.setPermissionList(List.of(instance.getCreateBy())); flowTask.setPermissionList(List.of(instance.getCreateBy()));
} }
// String nodeCode = flowTask.getNodeCode(); String nodeCode = flowTask.getNodeCode();
// // 查询节点信息 // 查询节点信息
// FlowNode byNodeCode = flwTaskService.getByNodeCode(nodeCode, definition.getId()); FlowNode byNodeCode = flwTaskService.getByNodeCode(nodeCode, definition.getId());
// // 获取原来的办理人信息 // 获取原来的办理人信息
// List<String> originalPermissionList = flowTask.getPermissionList(); List<String> originalPermissionList = flowTask.getPermissionList();
// log.info("节点 {} 原来的办理人信息: {}", nodeCode, originalPermissionList); log.info("节点 {} 原来的办理人信息: {}", nodeCode, originalPermissionList);
// String permissionFlag = byNodeCode.getPermissionFlag(); String permissionFlag = byNodeCode.getPermissionFlag();
// try { try {
// if (permissionFlag.contains("role")) { if (permissionFlag.contains("role")) {
// permissionFlag = permissionFlag.replace("@@", ","); permissionFlag = permissionFlag.replace("@@", ",");
//
// String flowCode = definition.getFlowCode(); String flowCode = definition.getFlowCode();
// String projectId = flowCode.split("_")[0]; String projectId = flowCode.split("_")[0];
//
// List<UserDTO> userDTOS = flwTaskAssigneeService.fetchUsersByStorageIds(permissionFlag, Long.valueOf(projectId)); List<UserDTO> userDTOS = flwTaskAssigneeService.fetchUsersByStorageIds(permissionFlag, Long.valueOf(projectId));
//
// flowTask.setPermissionList(userDTOS.stream().map(UserDTO::getUserId).map(String::valueOf).collect(Collectors.toList())); flowTask.setPermissionList(userDTOS.stream().map(UserDTO::getUserId).map(String::valueOf).collect(Collectors.toList()));
// } }
// } catch (Exception e) { } catch (Exception e) {
// log.error("设置失败: {}", e.getMessage()); log.error("设置失败: {}", e.getMessage());
// } }
} }
} }