From 34bb4e581ec1d057a6dd2110d189b28d9921b5dc Mon Sep 17 00:00:00 2001 From: zhaokai Date: Sat, 7 Mar 2026 15:59:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(training):=20=E6=B7=BB=E5=8A=A0=E6=8C=89?= =?UTF-8?q?=E8=AE=B0=E5=BD=95ID=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/training/TrainingApplyRecordQueryExe.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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) {