Merge branch 'feature/0721-tenant'

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

@@ -94,7 +94,7 @@ public class TenantAlbumController {
         //查关联表
         TenantAlbumRef one = tenantAlbumRefService.lambdaQuery().eq(TenantAlbumRef::getTenantAlbumId, id)
                 .last("limit 1").one();
-        vo.setTenantId(one.getTenantId());
+        vo.setTenantId(one.getTenantId().toString());
         //查询曲目表
 
         TenantInfo tenantInfo = tenantInfoService.getById(one.getTenantId());
@@ -164,7 +164,7 @@ public class TenantAlbumController {
                         TenantAlbumWrapper.TenantAlbumSheet tenantAlbumSheet = new TenantAlbumWrapper.TenantAlbumSheet();
                         tenantAlbumSheet.setLevel(m.getLevel());
                         tenantAlbumSheet.setType(m.getType());
-                        tenantAlbumSheet.setId(m.getId());
+                        tenantAlbumSheet.setId(m.getId().toString());
                        return tenantAlbumSheet;
                     }).collect(Collectors.toList()));
                     sheetData.setSubjectType(next.getSubjectType());
@@ -191,7 +191,7 @@ public class TenantAlbumController {
                 TenantAlbumWrapper.TenantAlbumSheet tenantAlbumSheet = new TenantAlbumWrapper.TenantAlbumSheet();
                 tenantAlbumSheet.setLevel(m.getLevel());
                 tenantAlbumSheet.setType(m.getType());
-                tenantAlbumSheet.setId(m.getId());
+                tenantAlbumSheet.setId(m.getId().toString());
                 return tenantAlbumSheet;
             }).collect(Collectors.toList()));
             sheetData.setSubjectType(next.getSubjectType());

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

@@ -341,7 +341,7 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
                 tenantAlbumMusic1.setTenantId(tenantId);
                 tenantAlbumMusic1.setSubjectType(next.getSubjectType());
                 tenantAlbumMusic1.setTenantAlbumId(tenantAlbum.getId());
-                tenantAlbumMusic1.setMusicSheetId(tenantAlbumMusic.getId());
+                tenantAlbumMusic1.setMusicSheetId(Long.valueOf(tenantAlbumMusic.getId()));
                 tenantAlbumMusic1.setSortNumber(sort.getAndIncrement());
                 tenantAlbumMusic1.setDelFlag(false);
                 tenantAlbumMusic1.setLevel(tenantAlbumMusic.getLevel());

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

@@ -83,7 +83,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
                 //查关联表
                 TenantAlbumRef one = tenantAlbumRefService.lambdaQuery().eq(TenantAlbumRef::getTenantAlbumId, i.getId())
                         .last("limit 1").one();
-                vo.setTenantId(one.getTenantId());
+                vo.setTenantId(one.getTenantId().toString());
 
                 //查询曲目表
                 TenantInfo tenantInfo = tenantInfoService.getById(one.getTenantId());

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

@@ -74,7 +74,7 @@ public class TenantAlbumWrapper {
         private String id;
 
         @ApiModelProperty("机构ID")
-        private Long tenantId;
+        private String tenantId;
 
         @ApiModelProperty("专辑名称")
         private String name;
@@ -263,10 +263,10 @@ public class TenantAlbumWrapper {
     public static class TenantAlbumSheet {
 
         @ApiModelProperty("主键ID")
-        private Long id;
+        private String id;
 
         @ApiModelProperty("机构ID")
-        private Long tenantId;
+        private String tenantId;
 
         @ApiModelProperty("声部分类(ENSEMBLE, MUSIC, SUBJECT)")
         private SubjectTypeEnum subjectType;