Merge branch 'feature/1019-tenant' into test

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

@@ -1065,7 +1065,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                     .eq(TenantGroup::getAdminId, teacher.getUserId());
             Integer count = tenantGroupMapper.selectCount(queryWrapper);
             if (count > 0) {
-                throw new BizException("该老师存在机构小组负责人身份，请先移交小组或者解散小组");
+                throw new BizException("先更换老师或者退出小组");
             }
 
             // 机构老师处理流程

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

@@ -249,7 +249,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         // 级别
         List<Long> levelIds =list.stream().map(TenantAlbumMusic::getLevel).distinct().filter(StringUtils::isNotBlank)
                 .filter(NumberUtil::isNumber).map(Long::valueOf).collect(Collectors.toList());
-        if (!typeIds.isEmpty()) {
+        if (!levelIds.isEmpty()) {
             List<TenantAlbumCategoryDetail> levelList = tenantAlbumCategoryDetailService.lambdaQuery()
                     .in(TenantAlbumCategoryDetail::getId, levelIds).list();
             List<String> levelNameList = levelList.stream()

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

@@ -224,7 +224,7 @@ public class TenantUnbindRecordServiceImpl extends ServiceImpl<TenantUnbindRecor
                 .eq(TenantGroup::getAdminId, teacher.getUserId());
         Integer count = tenantGroupMapper.selectCount(queryWrapper);
         if (count > 0) {
-            throw new BizException("该老师存在机构小组负责人身份，请先移交小组或者解散小组");
+            throw new BizException("先更换老师或者退出小组");
         }
 
         this.lambdaUpdate()

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

@@ -374,7 +374,7 @@
 		left join subject sb ON sb.id_ = st.subject_id_
 		where mprs.user_id_ = st.user_id_
 		<if test="search != null and search != ''">
-			AND su.username_ LIKE CONCAT('%',#{keyword},'%')
+			AND su.username_ LIKE CONCAT('%',#{search},'%')
 		</if>
 		<if test="tenantId != null">
 			AND st.tenant_id_ = #{tenantId}
@@ -435,7 +435,7 @@
 		left join subject sb ON sb.id_ = st.subject_id_
 		where mprs.user_id_ = st.user_id_
 		<if test="search != null and search != ''">
-			AND su.username_ LIKE CONCAT('%',#{keyword},'%')
+			AND su.username_ LIKE CONCAT('%',#{search},'%')
 		</if>
 		<if test="tenantId != null">
 			AND st.tenant_id_ = #{tenantId}