Merge branch 'feature/0721-tenant' into develop

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

@@ -338,7 +338,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
             if (StringUtils.isEmpty(acCode)) {
                 continue;
             }
-            int msgRowNo = rowIndex + 1;
+            int msgRowNo = rowIndex;
             code.checkIsIllegal().forEach(err -> errMsg.add(String.format(errTemplate, msgRowNo, err)));
             if (codeRowMap.containsKey(code.getCode())) {
                 errMsg.add(String.format(errTemplate, msgRowNo, "激活码重复"));

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

@@ -798,7 +798,7 @@
     <select id="countByUser" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetUploadCountVo">
         select user_id_ userId, count(id_) count
         from music_sheet
-        where del_flag_ = false and state_ =1 and source_type_ = 'TEACHER' user_id_ in
+        where del_flag_ = false and state_ =1 and source_type_ = 'TEACHER' and user_id_ in
         <foreach collection="userIds" open="(" close=")" separator="," item="item">
             #{item}
         </foreach>