|
@@ -13,6 +13,7 @@ import com.yonge.cooleshow.common.controller.BaseController;
|
|
|
import com.yonge.cooleshow.common.entity.HttpResponseResult;
|
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
|
import com.yonge.toolset.base.page.PageInfo;
|
|
|
+import com.yonge.toolset.base.util.StringUtil;
|
|
|
import com.yonge.toolset.mybatis.support.PageUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -77,7 +78,9 @@ public class TenantAlbumSheetController extends BaseController {
|
|
|
if (student == null) {
|
|
|
throw new BizException("学生信息不存在");
|
|
|
}
|
|
|
- query.setSubjectId(Long.parseLong(student.getSubjectId()));
|
|
|
+ if (!StringUtil.isEmpty(student.getSubjectId())) {
|
|
|
+ query.setSubjectId(Long.parseLong(student.getSubjectId()));
|
|
|
+ }
|
|
|
IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page = tenantAlbumMusicService.selectPage(QueryInfo.getPage(query), query);
|
|
|
return succeed((PageUtil.pageInfo(page)));
|
|
|
}
|