Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1562,6 +1562,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	@Override
 	@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 	public boolean awardedMonthlyRewards() {
+		//获取
 		List<Map<Integer, Integer>> list = courseScheduleDao.queryVipGroupTeachereClassTimesByMonth(new Date(), CourseStatusEnum.OVER);
 
 		if (list != null && list.size() > 0) {

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

@@ -143,6 +143,9 @@
 			<if test="teacherId">
 				AND FIND_IN_SET(#{teacherId},csrr.teacher_id_)
 			</if>
+			<if test="search">
+				AND csrr.name_ LIKE CONCAT('%',#{search},'%')
+			</if>
 			<if test="rewardMode">
 				AND csrr.reward_mode_ = #{rewardMode}
 			</if>

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

@@ -141,7 +141,7 @@
         AND (FIND_IN_SET(organ_id_,#{organId}) and user_id_ is NULL  or user_id_ = #{userId})
         </if>
         <if test="organId == null">
-        	and user_id_ = #{userId}
+        	or user_id_ = #{userId}
         </if>
     </select>
 </mapper>