Merge branch 'feature/0124' into online

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

@@ -198,7 +198,9 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         if (tenantInfo != null) {
             studentHomeVo.setTenantName(tenantInfo.getName());
             QueryWrapper<TenantGroupAlbum> queryWrapper = new QueryWrapper<>();
-            queryWrapper.lambda().eq(TenantGroupAlbum::getTenantGroupId, Optional.ofNullable(detail.getTenantGroupId()).orElse(-1L));
+            queryWrapper.lambda().eq(TenantGroupAlbum::getTenantGroupId, Optional.ofNullable(detail.getTenantGroupId()).orElse(-1L))
+                    .eq(TenantGroupAlbum::getDelFlag, false)
+                    .eq(TenantGroupAlbum::getStatus, true);
             List<TenantGroupAlbum> tenantGroupAlbums = tenantGroupAlbumMapper.selectList(queryWrapper);
             List<Long> albIds = tenantGroupAlbums.stream().map(TenantGroupAlbum::getTenantAlbumId).distinct().collect(Collectors.toList());
             if (!tenantGroupAlbums.isEmpty()) {