diff --git a/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingApplyRecordQueryExe.java b/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingApplyRecordQueryExe.java index b5c9bb8..22ea75b 100644 --- a/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingApplyRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/edu/command/query/training/TrainingApplyRecordQueryExe.java @@ -76,8 +76,11 @@ public class TrainingApplyRecordQueryExe { List recordIdList = examCenterCOS.stream().map(TrainingApplyRecordCO::getTrainingApplyRecordId).collect(Collectors.toList()); List trainingApplyProcessDOs = trainingApplyProcessRepository.getApproveDetailListByRecordIdList(recordIdList); //按照recordId分组 - Map> trainingApplyProcessDOMap = trainingApplyProcessDOs.stream() - .collect(Collectors.groupingBy(TrainingApplyProcessDO::getTrainingApplyRecordId)); + + Map> trainingApplyProcessDOMap = trainingApplyProcessDOs.stream() + .collect(Collectors.groupingBy(TrainingApplyProcessDO::getTrainingApplyRecordId, + Collectors.mapping(TrainingApplyProcessDO::getUserId, Collectors.toList()))); + boolean isCorrectCorp = corpInfoRepository.checkCorp(); //只有审批人和审批人的企业能进行审批 @@ -89,8 +92,8 @@ public class TrainingApplyRecordQueryExe { hasApprovalPermission = AuthContext.getTenantId().equals(info.getApprovalCorpinfoId()); } else { //委托人:检查是否在审批流程中 - List processList = trainingApplyProcessDOMap.get(info.getTrainingApplyRecordId()); - hasApprovalPermission = processList != null && processList.contains(AuthContext.getUserId()); + List userIdList = trainingApplyProcessDOMap.get(info.getTrainingApplyRecordId()); + hasApprovalPermission = userIdList != null && userIdList.contains(AuthContext.getUserId()); } if (hasApprovalPermission) {