|
@@ -55,20 +55,24 @@ public class EduSchoolController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "获取教师vip课教学点")
|
|
|
@GetMapping("/findVipSchoolByTeacher2")
|
|
|
- public Object findVipSchoolByTeacher2(Integer isDefault){
|
|
|
- SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- if(sysUser == null){
|
|
|
- return failed(HttpStatus.FORBIDDEN,"请登录");
|
|
|
+ public Object findVipSchoolByTeacher2(Integer userId,Integer isDefault){
|
|
|
+ Teacher teacher = null;
|
|
|
+ if(userId != null){
|
|
|
+ teacher = teacherDao.get(userId);
|
|
|
+ }else {
|
|
|
+ SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
+ if(sysUser == null){
|
|
|
+ return failed(HttpStatus.FORBIDDEN,"请登录");
|
|
|
+ }
|
|
|
+ teacher = teacherDao.get(sysUser.getId());
|
|
|
}
|
|
|
- Teacher teacher = teacherDao.get(sysUser.getId());
|
|
|
- if(teacher == null){
|
|
|
- return failed("非法访问");
|
|
|
+ if (teacher == null) {
|
|
|
+ return failed("用户信息获取失败");
|
|
|
}
|
|
|
-
|
|
|
String organIdList = teacher.getTeacherOrganId().toString();
|
|
|
if (StringUtils.isNoneBlank(teacher.getFlowOrganRange())) {
|
|
|
organIdList += "," + teacher.getFlowOrganRange();
|
|
|
}
|
|
|
- return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId(),organIdList,isDefault));
|
|
|
+ return succeed(schoolService.findVipSchoolByTeacher(teacher.getId(),organIdList,isDefault));
|
|
|
}
|
|
|
}
|