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

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

@@ -87,7 +87,7 @@ public class StudentCompetitionServiceImpl extends BaseServiceImpl<Long, Student
 
 	@Override
 	public void updateCompetition(StudentCompetition studentCompetition) {
-		if(Objects.nonNull(studentCompetition.getPrizeLevel())){
+		if(Objects.nonNull(studentCompetition.getPrizeLevel())&&studentCompetition.getPrizeLevel()>0){
 			Set<Long> competitionsWithPrizeLevel = studentCompetitionDao.getCompetitionsWithPrizeLevel(studentCompetition.getPrizeLevel());
 			int maxPrizeLevelUserNum = 0;
 			switch (studentCompetition.getPrizeLevel()){

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

@@ -117,7 +117,7 @@
         <where>
             del_flag_ != 1
             <if test="search != null">
-                AND (co.id_ LIKE CONCAT('%',#{search},'%') OR co.name_ LIKE CONCAT('%',#{search},'%'))
+                AND (id_ LIKE CONCAT('%',#{search},'%') OR name_ LIKE CONCAT('%',#{search},'%'))
             </if>
 	        <if test="organId != null">
 	            AND FIND_IN_SET(organ_id_,#{organId})