update

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

@@ -145,9 +145,6 @@ public class MusicSheetController extends BaseController {
         if (teacher == null) {
             return failed("用户信息获取失败");
         }
-        if(StringUtils.isBlank(query.getSubjectIds())){
-        	query.setSubjectIds(teacher.getSubjectId());
-        }
         // 老师课查看所有曲目
         if (query.getMyself() == null || query.getMyself()) {
             // 设置只查老师用户 状态为启用
@@ -161,6 +158,9 @@ public class MusicSheetController extends BaseController {
             query.setSourceType(SourceTypeEnum.TEACHER);
             query.setMyself(true);
         } else {
+            if(StringUtils.isBlank(query.getSubjectIds())){
+            	query.setSubjectIds(teacher.getSubjectId());
+            }
             // 检查app版本
             query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
 

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetController.java

@@ -8,7 +8,6 @@ import java.util.Date;
 
 import javax.validation.Valid;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -25,7 +24,6 @@ import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetRelatedQueryInfo;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
@@ -121,13 +119,6 @@ public class MusicSheetController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        Teacher teacher = teacherService.getById(sysUser.getId());
-        if (teacher == null) {
-            return failed("用户信息获取失败");
-        }
-        if(StringUtils.isBlank(query.getSubjectIds())){
-        	query.setSubjectIds(teacher.getSubjectId());
-        }
         // 设置只查老师用户 状态为启用
         query.setCreateBy(sysUser.getId());
         if (query.getAuditStatus() != null && AuthStatusEnum.PASS.getCode().equals(query.getAuditStatus().getCode())) {