Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -147,10 +147,9 @@
 
     <sql id="practiceGroupReviewsQueryCondition">
         <where>
-            AND pg.id_ > 0 AND cs.group_type_='PRACTICE' AND cs.status_='OVER' AND (cs.del_flag_ = 0 OR cs.del_flag_ IS
-            NULL)
+            AND pg.id_ > 0 AND cs.group_type_='PRACTICE' AND cs.status_='OVER' AND (cs.del_flag_ = 0 OR cs.del_flag_ IS NULL)
             <if test="search!=null and search!=''">
-                AND (pg.name_ LIKE CONCAT('%',#{search},'%') OR pg.id_= #{search})
+                AND (cs.name_ LIKE CONCAT('%',#{search},'%') OR cs.id_= #{search})
             </if>
             <if test="organId != null">
                 AND FIND_IN_SET(pg.organ_id_,#{organId})