Merge branch 'dev_1_2_20220802'

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

@@ -275,7 +275,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
         String liveRemark = WrapperUtil.toStr(param, "liveRemark", "直播间描述不能为空!");
         Integer liveTime = WrapperUtil.toInt(param, "liveTime", "请选择直播时长!");
         if (roomTitle.length() > 12) {
-            throw new BizException("房间标题不能超出12个字");
+            throw new BizException("房间标题不能超出20个字");
         }
         Date liveStartTime = new Date();
         Date liveEndTime = DateUtil.addMinutes(liveStartTime, liveTime);

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

@@ -64,15 +64,6 @@ public class VideoLessonGroupController extends BaseController {
         if (sysUser == null || sysUser.getId() == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        if(!StringUtil.isNullOrEmpty(query.getAuditStatus())){
-            if(query.getAuditStatus().equals("UNSHELVES")){
-                query.setAuditStatus(null);
-                query.setShelvesFlag(0);
-            }else{
-                query.setShelvesFlag(1);
-            }
-        }
-
         if (query.getMyself() == null || query.getMyself()) {
             query.setTeacherId(sysUser.getId());
         } else {
@@ -82,6 +73,15 @@ 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("UNSHELVES")){
+                query.setAuditStatus(null);
+                query.setShelvesFlag(0);
+            }else{
+                query.setShelvesFlag(1);
+            }
+        }
         IPage<VideoLessonGroupVo> pages = videoLessonGroupService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }