根据合作单位查询乐团

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

@@ -406,5 +406,5 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      */
     MusicGroup getStudentLastMusicGroup(@Param("userId") Integer userId);
 
-    List<MusicGroup> findByCooperationId(Integer cooperationId);
+    List<MusicGroup> findByCooperationId(@Param("cooperationOrganId") Integer cooperationOrganId, @Param("musicStatus") String musicStatus);
 }

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

@@ -3012,7 +3012,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     public List<MusicGroup> findByCooperationId(Integer cooperationId) {
-        return musicGroupDao.findByCooperationId(cooperationId);
+        return musicGroupDao.findByCooperationId(cooperationId,"PROGRESS");
     }
 
 }

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

@@ -740,7 +740,10 @@
         AND mg.educational_teacher_id_ IS NOT NULL
     </select>
     <select id="findByCooperationId" resultMap="MusicGroup">
-        SELECT * FROM music_group WHERE status_ = 'PROGRESS' AND cooperation_organ_id_ = #{cooperationId}
+        SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationId}
+        <if test="musicStatus != null">
+            AND status_ = #{musicStatus}
+        </if>
     </select>
 
     <select id="getStudentLastMusicGroup" resultMap="MusicGroup">