Merge branch 'online' into test

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -128,8 +128,8 @@ public class TenantAlbumController {
 
         if (CollectionUtils.isNotEmpty(coursewareList)) {
             List<CbsLessonCoursewareWrapper.Entity> entities = coursewareFeignService
-                .lessonCoursewareLambdaQuery(CbsLessonCoursewareWrapper.LambdaQuery.builder().ids(coursewareList).build()).feignData();
-            coursewareDtoMap.putAll(entities.stream().collect(Collectors.toMap(CbsLessonCoursewareWrapper.Entity::getId, Function.identity())));
+                .lessonCoursewareLambdaQuery(CbsLessonCoursewareWrapper.LambdaQuery.builder().ids(coursewareList).delFlag(false).build()).feignData();
+            coursewareDtoMap.putAll(entities.stream().filter(o-> !o.getDelFlag()).collect(Collectors.toMap(CbsLessonCoursewareWrapper.Entity::getId, Function.identity())));
         }
 
         Map<Long, MusicSheetVo> idMsMap = new HashMap<>();

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

@@ -97,7 +97,7 @@ public class StudentController extends BaseController {
     @GetMapping("/queryUserInfo")
     public HttpResponseResult<StudentHomeVo> queryUserInfo() throws Exception {
         SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
+        if (user == null || null == user.getId() || (user.getDelFlag()!=null && user.getDelFlag())) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(studentService.queryUserInfo(user));