gaoluyang
昨天 9cd4074a456fd5c422506279191b6015836347e5
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -149,10 +149,23 @@
                            .eq(ApprovalTask::getDeleted, 0)
            ).stream().collect(Collectors.groupingBy(ApprovalTask::getInstanceId));
            // 任务表本身不存审批方式,按节点实例回填会签/或签,避免前端统一显示为会签
            Map<Long, String> nodeApproveTypeMap = approvalInstanceNodeService.list(
                    Wrappers.<ApprovalInstanceNode>lambdaQuery()
                            .in(ApprovalInstanceNode::getInstanceId, instanceIds)
                            .eq(ApprovalInstanceNode::getDeleted, 0)
            ).stream().collect(Collectors.toMap(
                    ApprovalInstanceNode::getId,
                    node -> node.getApproveType() == null ? "" : node.getApproveType(),
                    (existing, replacement) -> existing
            ));
            for (ApprovalInstanceVo vo : records) {
                vo.setIsApprove(approveProcessConfigNodeUtils.isCurrentApprover(vo.getId(), currentUserId));
                vo.setRecords(recordMap.getOrDefault(vo.getId(), new ArrayList<>()));
                vo.setTasks(taskMap.getOrDefault(vo.getId(), new ArrayList<>()));
                List<ApprovalTask> instanceTasks = taskMap.getOrDefault(vo.getId(), new ArrayList<>());
                instanceTasks.forEach(task -> task.setApproveType(nodeApproveTypeMap.get(task.getNodeId())));
                vo.setTasks(instanceTasks);
                vo.setStorageBlobVOList(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.APPROVAL_INSTANCE, vo.getId()));
            }