update

mec-biz/src/main/java/com/ym/mec/biz/service/SysMusicScoreCategoriesService.java

@@ -11,7 +11,7 @@ public interface SysMusicScoreCategoriesService extends BaseService<Integer, Sys
 
     List<SysMusicScoreCategories> queryTree(MusicScoreQueryInfo menuQueryInfo);
     
-    List<SysMusicScoreCategories> queryCategoriesTreeList(String categoryIdList);
+    List<SysMusicScoreCategories> queryCategoriesTreeList(String categoryIdList, Boolean isQueryEnable);
 
     void save(SysMusicScoreCategories musicScoreCategories);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreCategoriesServiceImpl.java

@@ -45,7 +45,7 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 	}
 
 	@Override
-	public List<SysMusicScoreCategories> queryCategoriesTreeList(String categoryIds) {
+	public List<SysMusicScoreCategories> queryCategoriesTreeList(String categoryIds, Boolean isQueryEnable) {
 		
 		categoryIds = categoryIds.endsWith(",") ? categoryIds.substring(0, categoryIds.length() - 1) : categoryIds;
 
@@ -57,7 +57,13 @@ public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer,
 		SysMusicScoreCategories subCategory = null;
 		for(SysMusicScoreCategories smsc : categoryList){
 			
-			if(smsc == null || smsc.getEnable() != true){
+			if(smsc == null){
+				continue;
+			}
+			if(isQueryEnable == null){
+				isQueryEnable = true;
+			}
+			if(isQueryEnable == true && smsc.getEnable() != true){
 				continue;
 			}
 			parentCategory = getParentTree(smsc);

mec-biz/src/main/resources/config/mybatis/SysMusicCompareWeekDataMapper.xml

@@ -129,7 +129,7 @@
 				ON smcwd.performer_max_score_id_ = sms.id_
 			</if>
 		</if>
-		WHERE smcwd.monday_ = #{monday}
+		WHERE smcwd.monday_ = #{monday} and stu.membership_end_time_ &gt; now()
 			AND stu.user_id_ = smcwd.user_id_ and smcwd.tenant_id_ = #{tenantId}
 			<if test="organId != null">
 				AND su.organ_id_ = #{organId}

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreCategoriesController.java

@@ -41,7 +41,7 @@ public class SysMusicScoreCategoriesController extends BaseController {
 
     @ApiOperation(value = "树状列表")
     @GetMapping("/queryTree")
-    public Object queryTree() {
+    public Object queryTree(MusicScoreQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null || sysUser.getId() == null){
         	return failed(HttpStatus.FORBIDDEN, "请登录");
@@ -49,7 +49,7 @@ public class SysMusicScoreCategoriesController extends BaseController {
         
         TenantConfig tenantConfig = tenantConfigService.getOne(new QueryWrapper<TenantConfig>().eq("tenant_id_", sysUser.getTenantId()));
         
-        return succeed(sysMusicScoreCategoriesService.queryCategoriesTreeList(tenantConfig.getTeachingMaterialId()));
+        return succeed(sysMusicScoreCategoriesService.queryCategoriesTreeList(tenantConfig.getTeachingMaterialId(), queryInfo.getEnable()));
     }
 
     @ApiOperation(value = "获取分类详情")

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreCategoriesController.java

@@ -52,7 +52,7 @@ public class SysMusicScoreCategoriesController extends BaseController {
         
         TenantConfig tenantConfig = tenantConfigService.getOne(new QueryWrapper<TenantConfig>().eq("tenant_id_", sysUser.getTenantId()));
         
-        return succeed(sysMusicScoreCategoriesService.queryCategoriesTreeList(tenantConfig.getTeachingMaterialId()));
+        return succeed(sysMusicScoreCategoriesService.queryCategoriesTreeList(tenantConfig.getTeachingMaterialId(), queryInfo.getEnable()));
     }
 
     @ApiOperation(value = "获取分类详情")

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicScoreController.java

@@ -56,7 +56,7 @@ public class EduMusicScoreController extends BaseController {
         	return failed("当前用户所在机构信息查询失败");
         }
         
-        return succeed(sysMusicScoreCategoriesService.queryCategoriesTreeList(tenantConfig.getTeachingMaterialId()));
+        return succeed(sysMusicScoreCategoriesService.queryCategoriesTreeList(tenantConfig.getTeachingMaterialId(), queryInfo.getEnable()));
     }
 
     @ApiOperation(value = "分页查询")