joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

修改课程查询接口

Browse Source
This commit is contained in:
joylink_zhangsai 2021-03-30 15:24:35 +08:00
parent 4793a5a21a
commit 06f9914f1a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/controller/publish/LessonController.java
View File

@ -124,7 +124,7 @@ public class LessonController {
return iLessonService.pagedQueryByLoginProject(queryVO, loginInfo); return iLessonService.pagedQueryByLoginProject(queryVO, loginInfo);
} }
@ApiOperation(value = "查询用户当前登录的项目下的有效课程") @ApiOperation(value = "查询用户当前登录的项目下的课程")
@GetMapping(path = "/list/byLoginProject") @GetMapping(path = "/list/byLoginProject")
public List<LessonVO> queryByLoginProject(LessonQueryVO queryVO, public List<LessonVO> queryByLoginProject(LessonQueryVO queryVO,
@RequestAttribute(AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) { @RequestAttribute(AuthenticateInterceptor.LOGIN_INFO_KEY) LoginUserInfoVO loginInfo) {

3
src/main/java/club/joylink/rtss/services/LessonService.java
View File

@ -564,7 +564,7 @@ public class LessonService implements ILessonService {
@Override @Override
public List<LessonVO> queryByLoginProject(LessonQueryVO queryVO, LoginUserInfoVO loginInfo) { public List<LessonVO> queryByLoginProject(LessonQueryVO queryVO, LoginUserInfoVO loginInfo) {
return queryNonDefaultLessons(null, loginInfo.getProject(), BusinessConsts.STATUS_USE); return queryNonDefaultLessons(null, loginInfo.getProject(), queryVO.getStatus());
} }
@Override @Override
@ -585,7 +585,6 @@ public class LessonService implements ILessonService {
LsLessonExample example = new LsLessonExample(); LsLessonExample example = new LsLessonExample();
Criteria criteria = example.createCriteria() Criteria criteria = example.createCriteria()
.andMapIdIn(mapIds) .andMapIdIn(mapIds)
.andStatusEqualTo(BusinessConsts.STATUS_USE)
.andSysfaultEqualTo(false); .andSysfaultEqualTo(false);
if (creatorId != null) { if (creatorId != null) {
criteria.andCreatorIdEqualTo(creatorId); criteria.andCreatorIdEqualTo(creatorId);