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

 Conflicts:

	mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -406,6 +406,13 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
     List<MusicGroup> findByCooperationIdAndStatus(Integer cooperationOrganId);
 
     /**
+     * 根据合作单位获取乐团列表
+     * @param cooperationOrganId
+     * @return
+     */
+    List<MusicGroup> findByCooperationId(@Param("cooperationId") Integer cooperationOrganId);
+
+    /**
      * 批量修改乐团主管
      * @param cooperationOrganId
      * @param educationUserId
@@ -420,5 +427,4 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      */
     MusicGroup getStudentLastMusicGroup(@Param("userId") Integer userId);
 
-    List<MusicGroup> findByCooperationId(@Param("cooperationId") Integer cooperationOrganId);
 }

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

@@ -79,7 +79,7 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 				}
 			}
 			//更新预报名群信息
-			List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId(),null);
+			List<MusicGroup> musicGroupList = musicGroupDao.findByCooperationId(cooperationOrgan.getId());
 			if(musicGroupList.size() > 0){
 				for (MusicGroup musicGroup : musicGroupList) {
 					//不是导入的乐团