From 22fde3187f3743258063118b174a2fc59dd69b00 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 6 Mar 2026 09:45:06 +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 | 12 ++++++++++++ .../clientobject/training/TrainingApplyRecordCO.java | 3 +++ 2 files changed, 15 insertions(+) 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; + }