缴费中乐团合并学员

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/CoursePatrolEvaluationWrapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.core.conditions.update.Update;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
-import com.microsvc.toolkit.config.validator.group.ValidGroups;
+import com.microsvc.toolkit.config.validator.groupm.ValidGroups;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.EEvaluateProblemType;

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -313,6 +313,9 @@
     <sql id="musicGroupQueryPageSql">
         <where>
             mg.del_flag_ = 0 AND mg.tenant_id_ = #{tenantId}
+            <if test="musicGroupName != null and musicGroupName != ''">
+                AND mg.name_ LIKE CONCAT('%',#{musicGroupName},'%')
+            </if>
             <if test="organId != null">
                 AND FIND_IN_SET(mg.organ_id_,#{organId})
             </if>