|
@@ -24,10 +24,10 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
|
|
|
import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
|
|
|
-import com.yonge.cooleshow.biz.dal.entity.Student;
|
|
|
+import com.yonge.cooleshow.biz.dal.entity.Teacher;
|
|
|
import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
|
|
|
import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
|
|
|
-import com.yonge.cooleshow.biz.dal.service.StudentService;
|
|
|
+import com.yonge.cooleshow.biz.dal.service.TeacherService;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
|
|
|
import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
|
|
|
import com.yonge.cooleshow.common.controller.BaseController;
|
|
@@ -54,7 +54,7 @@ public class MusicAlbumController extends BaseController {
|
|
|
private MusicAlbumService musicAlbumService;
|
|
|
|
|
|
@Autowired
|
|
|
- private StudentService studentService;
|
|
|
+ private TeacherService teacherService;
|
|
|
|
|
|
@Autowired
|
|
|
private AppVersionInfoService appVersionInfoService;
|
|
@@ -67,15 +67,15 @@ public class MusicAlbumController extends BaseController {
|
|
|
return failed("用户信息获取失败");
|
|
|
}
|
|
|
|
|
|
- Student student = studentService.getById(sysUser.getId());
|
|
|
- if (student == null) {
|
|
|
+ Teacher teacher = teacherService.getById(sysUser.getId());
|
|
|
+ if (teacher == null) {
|
|
|
return failed("用户信息获取失败");
|
|
|
}
|
|
|
|
|
|
if(query.getSubjectIdList() == null || query.getSubjectIdList().size() == 0){
|
|
|
List<Long> subjectIdList = new ArrayList<Long>();
|
|
|
- if(StringUtils.isNotBlank(student.getSubjectId())){
|
|
|
- String[] subjectIds = student.getSubjectId().split(",");
|
|
|
+ if(StringUtils.isNotBlank(teacher.getSubjectId())){
|
|
|
+ String[] subjectIds = teacher.getSubjectId().split(",");
|
|
|
for(String s : subjectIds){
|
|
|
subjectIdList.add(Long.parseLong(s));
|
|
|
}
|