Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -138,9 +138,10 @@ public class HotTrainingCourseConfigController extends BaseController {
|
||||
public R<Map<String, Object>> trainingStudyDetail(
|
||||
@RequestParam Long companyId,
|
||||
@RequestParam Long trainingId,
|
||||
@RequestParam String userId
|
||||
@RequestParam String userId,
|
||||
@RequestParam(required = false, defaultValue = "false") Boolean forceView
|
||||
) {
|
||||
if (!isDriverTrainingAccessible(companyId, trainingId, userId)) {
|
||||
if (!Boolean.TRUE.equals(forceView) && !isDriverTrainingAccessible(companyId, trainingId, userId)) {
|
||||
return R.fail("当前学习计划已关闭或已过期");
|
||||
}
|
||||
HotTrainingVo training = hotTrainingService.queryById(trainingId);
|
||||
|
||||
Reference in New Issue
Block a user