1、陪练课调整

2、付费陪练课可预约时间调整

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

@@ -42,6 +42,17 @@
         </where>
     </sql>
 
+    <sql id="searchPracticeGroupsCondition">
+        <where>
+            <if test="search!=null">
+                AND (g.id_ = #{search} OR g.name_ LIKE CONCAT( '%', #{search}, '%' ))
+            </if>
+            <if test="organIdList!=null">
+                AND FIND_IN_SET(g.organ_id_,#{organIdList})
+            </if>
+        </where>
+    </sql>
+
     <delete id="deleteGroup">
         DELETE FROM
         <if test="groupType!=null and groupType=='MUSIC'.toString()">
@@ -65,7 +76,12 @@
         ( SELECT o.id_ organ_id_,o.name_ organ_name_,g.id_, g.name_ group_name_, 'VIP' group_type_
         FROM vip_group g
         LEFT JOIN organization o ON g.organ_id_ = o.id_
-        <include refid="searchVipGroupsCondition"/> );
+        <include refid="searchVipGroupsCondition"/> )
+        UNION
+        ( SELECT o.id_ organ_id_,o.name_ organ_name_,g.id_, g.name_ group_name_, 'PRACTICE' group_type_
+        FROM practice_group g
+        LEFT JOIN organization o ON g.organ_id_ = o.id_
+        <include refid="searchPracticeGroupsCondition"/> );
     </select>
     <select id="findByGroupIds" resultMap="Group">
       ( SELECT o.id_ organ_id_,o.name_ organ_name_,g.id_, g.name_ group_name_, 'MUSIC' group_type_