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); }