update

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

@@ -66,7 +66,7 @@ public class UserTenantAlbumRecordController {
     //@PreAuthorize("@auditsvc.hasPermissions('userTenantAlbumRecord/page', {'BACKEND'})")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<TenantAlbumWrapper.TenantAlbum>> page(@RequestBody UserTenantAlbumRecordWrapper.UserTenantAlbumRecordQuery query) {
-
+    	query.setClientEnum(ClientEnum.STUDENT);
         IPage<TenantAlbumWrapper.TenantAlbum> pages = userTenantAlbumRecordService.selectPage(QueryInfo.getPage(query), query);
 
         return HttpResponseResult.succeed(PageUtil.pageInfo(pages));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/UserTenantAlbumRecordMapper.java

@@ -32,7 +32,7 @@ public interface UserTenantAlbumRecordMapper extends BaseMapper<UserTenantAlbumR
 
     List<UserTenantAlbumRecordWrapper.UserTenantAlbumRecord> selectUserTenantAlbumRecordPage(@Param("page") IPage<UserTenantAlbumRecordWrapper.UserTenantAlbumRecord> page, @Param("param") UserTenantAlbumRecordWrapper.UserTenantAlbumRecordQuery param);
 
-    List<Long> selectTenantIds(@Param("id") Long id);
+    List<Long> selectTenantIds(@Param("id") Long id, @Param("clientType") ClientEnum clientType);
 
     List<TenantAlbum> selectTenantAlbumInfo(@Param("tenantIds") List<Long> tenantIds);
 

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

@@ -779,7 +779,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     if (userType == ClientEnum.STUDENT) {
                         detail.setTenantFlag(true);
                         // 机构学生
-                        List<Long> tenantAlbumIds = userTenantAlbumRecordMapper.selectTenantIds(sysUser.getId());
+                        List<Long> tenantAlbumIds = userTenantAlbumRecordMapper.selectTenantIds(sysUser.getId(), userType);
                         if (CollectionUtils.isNotEmpty(tenantAlbumIds)) {
                             List<Long> musicSheetIds = tenantAlbumMusicService.getMusicIdsByIds(tenantAlbumIds);
                             if (musicSheetIds.contains(detail.getId())) {
@@ -824,7 +824,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
             // 学生生效中的机构专辑
             if (ClientEnum.STUDENT == userType || ClientEnum.TEACHER == userType) {
-                List<Long> tenantAlbumIds = userTenantAlbumRecordMapper.selectTenantIds(sysUser.getId());
+                List<Long> tenantAlbumIds = userTenantAlbumRecordMapper.selectTenantIds(sysUser.getId(), userType);
                 if (CollectionUtils.isNotEmpty(tenantAlbumIds)) {
                     // tenantAlbumIds collected 取交集到 新的集合
                     List<Long> collect = tenantAlbumIds.stream().filter(collected::contains).collect(Collectors.toList());

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

@@ -138,7 +138,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
 
         //查询生效的机构专辑id
         if (id != null) {
-            List<Long> tenantAlbumIds = baseMapper.selectTenantIds(id);
+            List<Long> tenantAlbumIds = baseMapper.selectTenantIds(id, query.getClientEnum());
             if (CollectionUtils.isEmpty(tenantAlbumIds)) {
                 return null;
             }

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

@@ -69,6 +69,9 @@ public class UserTenantAlbumRecordWrapper {
 
         @ApiModelProperty("扣减开始时间")
         private Date deductionStartTime;
+        
+        @ApiModelProperty("客户端")
+        private ClientEnum clientEnum;
 
 
         @ApiModelProperty("扣减结束时间")

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

@@ -49,6 +49,9 @@
           <if test="id != null">
               and user_id_ = #{id}
           </if>
+          <if test="clientType != null">
+              and client_type_ = #{clientType}
+          </if>
         </where>
     </select>
     <select id="selectTenantAlbumInfo" resultType="com.yonge.cooleshow.biz.dal.entity.TenantAlbum">