Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

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

@@ -473,17 +473,19 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         if (student.getTenantId().equals(toTenantId)) {
             return;
         }
-        List<ImGroupMember> groupMembers = imGroupMemberService.lambdaQuery()
-                .eq(ImGroupMember::getUserId, student.getUserId())
-                .eq(ImGroupMember::getRoleType, ClientEnum.STUDENT.getCode())
-                .eq(ImGroupMember::getIsAdmin, false).list();
-        List<String> groupIdList = groupMembers.stream().map(ImGroupMember::getGroupId).distinct()
-                .collect(Collectors.toList());
-        for (String groupId : groupIdList) {
-            try {
-                imGroupService.quit(groupId, student.getUserId(), ClientEnum.STUDENT);
-            } catch (Exception e) {
-                log.error("退出群聊失败", e);
+        if (!student.getTenantId().equals(-1L)) {
+            List<ImGroupMember> groupMembers = imGroupMemberService.lambdaQuery()
+                    .eq(ImGroupMember::getUserId, student.getUserId())
+                    .eq(ImGroupMember::getRoleType, ClientEnum.STUDENT.getCode())
+                    .eq(ImGroupMember::getIsAdmin, false).list();
+            List<String> groupIdList = groupMembers.stream().map(ImGroupMember::getGroupId).distinct()
+                    .collect(Collectors.toList());
+            for (String groupId : groupIdList) {
+                try {
+                    imGroupService.quit(groupId, student.getUserId(), ClientEnum.STUDENT);
+                } catch (Exception e) {
+                    log.error("退出群聊失败", e);
+                }
             }
         }
         this.lambdaUpdate().set(Student::getTenantId, toTenantId)

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.biz.dal.entity.*;
@@ -92,7 +93,27 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
     @Override
     public IPage<TenantAlbumWrapper.TenantAlbum> selectPage(IPage<TenantAlbumWrapper.TenantAlbum> page,
                                                             TenantAlbumWrapper.TenantAlbumQuery query) {
-        return page.setRecords(baseMapper.selectPage(page, query));
+        //查询机构专辑表数据
+        List<TenantAlbumWrapper.TenantAlbum> tenantAlbums = baseMapper.selectPage(page, query);
+
+        if (CollectionUtils.isNotEmpty(tenantAlbums)){
+            tenantAlbums.stream().forEach(t->{
+                if (t.getMusicNum() == null){
+                    //获取每一个机构专辑Id
+                    String id = t.getId();
+                    //查询机构专辑曲目表里  所对应的曲目数
+                    List<TenantAlbumMusic> list = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantAlbumId, id).eq(TenantAlbumMusic::getDelFlag,false).list();
+                    //获取曲目数量
+                    List<Long> MusicList = list.stream().map(TenantAlbumMusic::getMusicSheetId).collect(Collectors.toList());
+                    int num = MusicList.size();
+                    t.setMusicNum(num);
+                }
+            });
+
+        }
+
+
+        return page.setRecords(tenantAlbums);
     }
 
     /**