问题修改

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

@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -83,6 +84,10 @@ public class UserTenantAlbumRecordController {
         if (student == null || student.getTenantId() == null || student.getTenantId() == -1L) {
             throw new BizException("请求非法");
         }
+        Long tenantGroupId = student.getTenantGroupId();
+        if (tenantGroupId == null || tenantGroupId == -1L) {
+            return R.from(new ArrayList<>());
+        }
         query.setUserId(sysUser.getId());
         query.setEndTime(new Date());
         query.setTenantId(student.getTenantId());

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

@@ -684,12 +684,12 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
 
         List<Long> tenantAlbumIdList = new ArrayList<>();
         Long tenantGroupId = query.getTenantGroupId();
-        if (tenantGroupId != null) { // 学生只看小组下的专辑列表
+        if (tenantGroupId != null) { // 学生只看当前就够的专辑列表
             QueryWrapper<TenantGroupAlbum> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda()
-                    .eq(TenantGroupAlbum::getTenantGroupId, tenantGroupId)
-                    .eq(TenantGroupAlbum::getDelFlag, false)
-                    .eq(TenantGroupAlbum::getStatus, true);
+                    .eq(TenantGroupAlbum::getTenantGroupId, tenantGroupId);
+//                    .eq(TenantGroupAlbum::getDelFlag, false)
+//                    .eq(TenantGroupAlbum::getStatus, true);
             List<TenantGroupAlbum> tenantGroupAlbums = tenantGroupAlbumMapper.selectList(queryWrapper);
             if (CollectionUtils.isEmpty(tenantGroupAlbums)) {
                 return new ArrayList<>();