Commit fe99c95f8c6c349de584e4eda83916ab7b01bdb8
1 parent
14fad915
【缺陷修复】 修复从我的流程进入审批详情页面，表单权限问题
Showing
1 changed file
with
3 additions
and
1 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
| @@ -264,8 +264,10 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | @@ -264,8 +264,10 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService | ||
| 264 | Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds); | 264 | Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds); |
| 265 | Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId)); | 265 | Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId)); |
| 266 | 266 | ||
| 267 | + | ||
| 267 | // 2. 表单权限 | 268 | // 2. 表单权限 |
| 268 | - Map<String, String> formFieldsPermission = getFormFieldsPermission(bpmnModel, reqVO.getActivityId(), reqVO.getTaskId()); | 269 | + String taskId = reqVO.getTaskId() == null && todoTask != null ? todoTask.getId() : reqVO.getTaskId(); |
| 270 | + Map<String, String> formFieldsPermission = getFormFieldsPermission(bpmnModel, reqVO.getActivityId(), taskId); | ||
| 269 | 271 | ||
| 270 | // 3. 拼接数据 | 272 | // 3. 拼接数据 |
| 271 | return BpmProcessInstanceConvert.INSTANCE.buildApprovalDetail(bpmnModel, processDefinition, processDefinitionInfo, processInstance, | 273 | return BpmProcessInstanceConvert.INSTANCE.buildApprovalDetail(bpmnModel, processDefinition, processDefinitionInfo, processInstance, |