From ab60d860de805cdaeacd19ac7a868598ffee6cdc Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 6 Mar 2026 10:15:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(training):=20=E6=B7=BB=E5=8A=A0=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=E7=94=B3=E8=AF=B7=E8=AE=B0=E5=BD=95=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/training/TrainingApplyRecordQueryExe.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 590c14f..477e2c3 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 @@ -14,6 +14,7 @@ import com.zcloud.edu.dto.clientobject.training.TrainingApplyRecordCO; import com.zcloud.edu.persistence.dataobject.TrainingApplyProcessDO; import com.zcloud.edu.persistence.dataobject.TrainingApplyRecordDO; import com.zcloud.edu.persistence.dataobject.TrainingApplyUserDO; +import com.zcloud.edu.persistence.repository.resource.CorpInfoRepository; import com.zcloud.edu.persistence.repository.training.TrainingApplyProcessRepository; import com.zcloud.edu.persistence.repository.training.TrainingApplyRecordRepository; import com.zcloud.edu.persistence.repository.training.TrainingApplyUserRepository; @@ -44,6 +45,7 @@ public class TrainingApplyRecordQueryExe { private final TrainingApplyUserCoConvertor trainingApplyUserCoConvertor; private final TrainingApplyProcessRepository trainingApplyProcessRepository; + private final CorpInfoRepository corpInfoRepository; /** * 分页 @@ -69,7 +71,12 @@ public class TrainingApplyRecordQueryExe { //只有审批人和审批人的企业能进行审批 examCenterCOS.forEach(info->{ //只有审批人和审批人的企业能进行审批 - if (AuthContext.getUserId().equals(info.getApprovalUserId()) || AuthContext.getTenantId().equals(info.getApprovalCorpinfoId())) { + boolean isCorrectCorp = corpInfoRepository.checkCorp(); + boolean hasApprovalPermission = isCorrectCorp + ? AuthContext.getTenantId().equals(info.getApprovalCorpinfoId()) + : AuthContext.getUserId().equals(info.getApprovalUserId()); + + if (hasApprovalPermission) { info.setIsApproval(true); }