From e8f15ae7400405daff9960442f915da44bf27426 Mon Sep 17 00:00:00 2001 From: shihongwei <178899525@qq.com> Date: Wed, 27 May 2026 16:11:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AF=BE=E7=A8=8B=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HotTrainingCourseConfigController.java | 3 ++- .../domain/bo/HotTrainingCourseConfigBo.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hotwj/platform/securityManagement/trainingCourseConfig/controller/HotTrainingCourseConfigController.java b/src/main/java/com/hotwj/platform/securityManagement/trainingCourseConfig/controller/HotTrainingCourseConfigController.java index 2b646cf..439b0ab 100644 --- a/src/main/java/com/hotwj/platform/securityManagement/trainingCourseConfig/controller/HotTrainingCourseConfigController.java +++ b/src/main/java/com/hotwj/platform/securityManagement/trainingCourseConfig/controller/HotTrainingCourseConfigController.java @@ -66,7 +66,8 @@ public class HotTrainingCourseConfigController extends BaseController { @GetMapping("/list") @Operation(summary = "分页查询企业课程配置列表") public TableDataInfo list(HotTrainingCourseConfigBo bo, PageQuery pageQuery) { - if (bo.getTrainingId() != null && StringUtils.isNotBlank(bo.getUserId()) + // TODO + if (!Boolean.TRUE.equals(bo.getSkipIntercept()) && bo.getTrainingId() != null && StringUtils.isNotBlank(bo.getUserId()) && !isDriverTrainingAccessible(bo.getCompanyId(), bo.getTrainingId(), bo.getUserId())) { TableDataInfo result = TableDataInfo.build(Collections.emptyList()); result.setMsg("当前学习计划已关闭或已过期"); diff --git a/src/main/java/com/hotwj/platform/securityManagement/trainingCourseConfig/domain/bo/HotTrainingCourseConfigBo.java b/src/main/java/com/hotwj/platform/securityManagement/trainingCourseConfig/domain/bo/HotTrainingCourseConfigBo.java index de024d4..83bcda5 100644 --- a/src/main/java/com/hotwj/platform/securityManagement/trainingCourseConfig/domain/bo/HotTrainingCourseConfigBo.java +++ b/src/main/java/com/hotwj/platform/securityManagement/trainingCourseConfig/domain/bo/HotTrainingCourseConfigBo.java @@ -82,4 +82,9 @@ public class HotTrainingCourseConfigBo extends BaseEntity { private String updateByName; private String userId; + + /** + * 是否跳过过期/关闭拦截(用于后台详情展示等场景) + */ + private Boolean skipIntercept; }