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 24ef086..590c14f 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 @@ -1,5 +1,6 @@ package com.zcloud.edu.command.query.training; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.edu.command.convertor.training.TrainingApplyProcessCoConvertor; import com.zcloud.edu.command.convertor.training.TrainingApplyRecordCoConvertor; import com.zcloud.edu.command.convertor.training.TrainingApplyUserCoConvertor; @@ -64,6 +65,17 @@ public class TrainingApplyRecordQueryExe { Map params = PageQueryHelper.toHashMap(trainingApplyRecordPageQry); PageResponse pageResponse = trainingApplyRecordRepository.listPageSql(params); List examCenterCOS = trainingApplyRecordCoConvertor.converDOsToCOs(pageResponse.getData()); + + //只有审批人和审批人的企业能进行审批 + examCenterCOS.forEach(info->{ + //只有审批人和审批人的企业能进行审批 + if (AuthContext.getUserId().equals(info.getApprovalUserId()) || AuthContext.getTenantId().equals(info.getApprovalCorpinfoId())) { + info.setIsApproval(true); + } + + }); + + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } diff --git a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java index 1bc0c8f..4691c28 100644 --- a/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java +++ b/web-client/src/main/java/com/zcloud/edu/dto/clientobject/training/TrainingApplyRecordCO.java @@ -114,5 +114,8 @@ public class TrainingApplyRecordCO extends ClientObject { @ApiModelProperty(value = "审批委托信息") private List approveDetails; + @ApiModelProperty(value = "是否审批") + private Boolean isApproval = false; + }