feat: 支持强制显示课程信息
This commit is contained in:
@@ -66,7 +66,8 @@ public class HotTrainingCourseConfigController extends BaseController {
|
|||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
@Operation(summary = "分页查询企业课程配置列表")
|
@Operation(summary = "分页查询企业课程配置列表")
|
||||||
public TableDataInfo<HotTrainingCourseConfigVo> list(HotTrainingCourseConfigBo bo, PageQuery pageQuery) {
|
public TableDataInfo<HotTrainingCourseConfigVo> 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())) {
|
&& !isDriverTrainingAccessible(bo.getCompanyId(), bo.getTrainingId(), bo.getUserId())) {
|
||||||
TableDataInfo<HotTrainingCourseConfigVo> result = TableDataInfo.build(Collections.emptyList());
|
TableDataInfo<HotTrainingCourseConfigVo> result = TableDataInfo.build(Collections.emptyList());
|
||||||
result.setMsg("当前学习计划已关闭或已过期");
|
result.setMsg("当前学习计划已关闭或已过期");
|
||||||
|
|||||||
@@ -82,4 +82,9 @@ public class HotTrainingCourseConfigBo extends BaseEntity {
|
|||||||
private String updateByName;
|
private String updateByName;
|
||||||
|
|
||||||
private String userId;
|
private String userId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否跳过过期/关闭拦截(用于后台详情展示等场景)
|
||||||
|
*/
|
||||||
|
private Boolean skipIntercept;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user