添加id

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

@@ -18,6 +18,7 @@ import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -142,7 +143,7 @@ public class TenantAlbumController {
             tenantAlbumSheets.stream().forEach(t->{
                 String musicSubject = t.getMusicSubject();
 
-                if (!musicSubject.isEmpty()){
+                if (StringUtils.isNotBlank(musicSubject)){
                     //设置对应声部名称
                     List<Subject> subject = subjectService.findBySubjectByIdList(musicSubject);
                     t.setMusicSubjectName(subject.get(0).getName());
@@ -151,7 +152,7 @@ public class TenantAlbumController {
 
                 //设置对应标签名称
                 String musicTag = t.getMusicTag();
-                if (!musicTag.isEmpty()){
+                if (StringUtils.isNotBlank(musicTag)){
                     String[] split = musicTag.split(",");
                     for (String s : split) {
                         List<Long> list = new ArrayList<>();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumMusicWrapper.java

@@ -173,6 +173,9 @@ public class TenantAlbumMusicWrapper {
         @AllArgsConstructor
         @ApiModel(" TenantAlbumMusic-学生端专辑曲目返回")
         public static class StudentTenantAlbumMusic implements QueryInfo {
+            @ApiModelProperty(value = "曲目表id")
+            private Long id;
+
             @ApiModelProperty(value = "精品标志")
             private String exquisiteFlag;
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMusicMapper.xml

@@ -19,6 +19,7 @@
     
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumMusicWrapper$StudentTenantAlbumMusic">
 		SELECT
+        m.id_ as id,
         m.music_sheet_name_ as musicSheetName,
         m.composer_ as composer,
         m.user_id_ as userId,