Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -825,7 +825,7 @@
         update music_sheet set state_ = #{state} where FIND_IN_SET(cbs_music_sheet_id_,#{ids})
     </update>
     <update id="batchDel">
-        update music_sheet set del_flag_ = 1 where FIND_IN_SET(cbs_music_sheet_id_,#{ids})
+        DELETE FROM music_sheet where FIND_IN_SET(cbs_music_sheet_id_,#{ids})
     </update>
 
     <select id="countByUser" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetUploadCountVo">
@@ -883,7 +883,7 @@
             resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetExtendWrapper$MusicSheetExtend">
         select su.id_ userId,su.username_ username
              ,'TEACHER' clientType,su.phone_ phone from sys_user su
-        where su.user_type_ LIKE '%TEACHER%' AND su.del_flag_ = 0
+        where su.user_type_ LIKE '%TEACHER%' AND su.del_flag_ = 0 AND su.lock_flag_ = 0
         <if test="param.name != null and param.name != ''">
             AND (su.phone_ LIKE CONCAT('%',#{param.name},'%') OR su.username_ LIKE CONCAT('%',#{param.name},'%'))
         </if>