Revert "fix"

This reverts commit 8547d247cea564fc99d0a2effd647496155e5c4d.

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/TenantAlbumSheetController.java

@@ -161,9 +161,6 @@ public class TenantAlbumSheetController extends BaseController {
 
         query.setClientType(ClientEnum.STUDENT);
         query.setUserId(user.getId());
-        if (!StringUtil.isEmpty(student.getSubjectId())) {
-            query.setSubejctId(Integer.parseInt(student.getSubjectId()));
-        }
         query.setTenantId(Optional.ofNullable(student.getTenantId()).orElse(-1L));
         List<LessonCoursewareDetailWrapper.RefLevelDetailInfo> result = tenantAlbumMusicService.refLevel(query);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumMusicServiceImpl.java

@@ -531,7 +531,6 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         }
         List<Long> courseIds = new ArrayList<>();
         List<LessonCoursewareDetailWrapper.RefLevelDetailInfo> result = new ArrayList<>();
-        List<ECourseType> courseTypeList = new ArrayList<>();
         if (query.getClientType() == ClientEnum.TEACHER) {
             // 查询出机构下的所有可用教材
             List<TenantAlbumMusic> detail = tenantAlbumMusicService.lambdaQuery()
@@ -548,9 +547,6 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
             if (CollectionUtils.isNotEmpty(useAlbumIdsByUserId)) {
                 courseIds = tenantAlbumMusicService.getTenantAlbumMusicIdsByIds(useAlbumIdsByUserId, Collections.singletonList(SubjectTypeEnum.COURSEWARE));
             }
-            if (query.getSubejctId() != null) {
-            courseTypeList = courseTypeBySubject(query.getSubejctId().longValue());
-            }
         }
         if (CollectionUtils.isEmpty(courseIds)) {
             return new ArrayList<>();
@@ -580,7 +576,6 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         cbsQuery.setEnableFlag(true);
 //        cbsQuery.setOrchestraType(lessonCourseware.getOrchestraType());
         cbsQuery.setLessonCoursewareIds(courseIds);
-        cbsQuery.setCourseTypes(courseTypeList);
         cbsQuery.setPage(1);
         cbsQuery.setRows(9999);
         cbsQuery.setLevel(lessonCourseware.getLevel());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/LessonCoursewareDetailWrapper.java

@@ -166,8 +166,6 @@ public class LessonCoursewareDetailWrapper {
         @ApiModelProperty("用户类型")
         private ClientEnum clientType;
 
-        private Integer subejctId;
-
         @ApiModelProperty("用户ID")
         private Long userId;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMusicMapper.xml

@@ -148,8 +148,7 @@
         <foreach collection="tenantAlbumIds" item="item" index="index" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        and ((t1.tenant_state_ = 1 and t1.tenant_del_flag_ = 0 and t.subject_type_ in ('ENSEMBLE', 'MUSIC', 'SUBJECT'))
-        or t.subject_type_ not in ('ENSEMBLE', 'MUSIC', 'SUBJECT'))
+        and ( t.subject_type_ in  ('ENSEMBLE', 'MUSIC', 'SUBJECT') and t1.tenant_del_flag_ =0 and t1.tenant_state_ = 1)
         and t.subject_type_ in
         <foreach collection="subjectTypes" item="item" index="index" open="(" close=")" separator=",">
             #{item.code}