yonge 1 week ago
parent
commit
2036f722f4

+ 1 - 1
cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/UserTenantAlbumRecordController.java

@@ -70,7 +70,7 @@ public class UserTenantAlbumRecordController extends BaseController {
         userTenantAlbumRecord.setType(userTenantAlbumRecordVo.getType());
         userTenantAlbumRecord.setReason(userTenantAlbumRecordVo.getReason());
         userTenantAlbumRecord.setUserId(userTenantAlbumRecordVo.getUserId());
-        userTenantAlbumRecord.setClientType(ClientEnum.STUDENT);
+        //userTenantAlbumRecord.setClientType(ClientEnum.STUDENT);
         userTenantAlbumRecord.setSourceType(SourceTypeEnum.BACKEND_GIVE);
 
         SysUser sysUser = sysUserService.getUser();

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

@@ -823,7 +823,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             List<Long> collected = Arrays.stream(tenantAlbumId.split(",")).map(Long::parseLong).collect(Collectors.toList());
 
             // 学生生效中的机构专辑
-            if (ClientEnum.STUDENT == userType) {
+            if (ClientEnum.STUDENT == userType || ClientEnum.TEACHER == userType) {
                 List<Long> tenantAlbumIds = userTenantAlbumRecordMapper.selectTenantIds(sysUser.getId());
                 if (CollectionUtils.isNotEmpty(tenantAlbumIds)) {
                     // tenantAlbumIds collected 取交集到 新的集合