视频课下架查询问题修改

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

@@ -29,6 +29,7 @@ import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.string.MessageFormatter;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
+import io.netty.util.internal.StringUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -81,6 +82,14 @@ public class VideoLessonGroupServiceImpl extends ServiceImpl<VideoLessonGroupDao
      */
     @Override
     public IPage<VideoLessonGroupVo> selectPage(IPage<VideoLessonGroupVo> page, VideoLessonGroupSearch query) {
+        if(!StringUtil.isNullOrEmpty(query.getAuditStatus())){
+            if(query.getAuditStatus().equals("OUT_SALE")){
+                query.setAuditStatus(null);
+                query.setShelvesFlag(0);
+            }else{
+                query.setShelvesFlag(1);
+            }
+        }
         return page.setRecords(baseMapper.selectPage(page, query));
     }
 

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

@@ -52,7 +52,7 @@
             left join (
                 select
                     ar.activity_id_,aer.user_id_,
-                    group_concat(ms.music_sheet_name_) as music_sheet_name_,
+                    group_concat(DISTINCT ms.music_sheet_name_) as music_sheet_name_,
                     count(aer.id_) as num_,
                     max(aer.score_) as max_score_
                 from activity_registration ar

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

@@ -73,15 +73,6 @@ public class VideoLessonGroupController extends BaseController {
         if (query.getMyself() != null && !query.getMyself()) {
             query.setAuditStatus(AuthStatusEnum.PASS.getCode());
         }
-
-        if(!StringUtil.isNullOrEmpty(query.getAuditStatus())){
-            if(query.getAuditStatus().equals("OUT_SALE")){
-                query.setAuditStatus(null);
-                query.setShelvesFlag(0);
-            }else{
-                query.setShelvesFlag(1);
-            }
-        }
         IPage<VideoLessonGroupVo> pages = videoLessonGroupService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }