小小训练营改造

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

@@ -281,7 +281,7 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @date 2020/9/7
      * @time 14:31
      */
-    List<MusicCardDto> queryOrganMusicInfos(@Param("organId") Integer organId, @Param("tenantId") Integer tenantId);
+    List<MusicCardDto> queryOrganMusicInfos(@Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
      * @param userId:

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -387,7 +387,7 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
      * @date 2020/9/7
      * @time 14:28
      */
-    List<MusicCardDto> queryOrganMusicInfos(Integer organId);
+    List<MusicCardDto> queryOrganMusicInfos(String organId);
 
 
     /**

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

@@ -1687,7 +1687,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
     @Override
-    public List<MusicCardDto> queryOrganMusicInfos(Integer organId) {
+    public List<MusicCardDto> queryOrganMusicInfos(String organId) {
         return musicGroupDao.queryOrganMusicInfos(organId, TenantContextHolder.getTenantId());
     }
 

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

@@ -763,8 +763,8 @@
         mg.id_ music_group_id_
         FROM music_group mg
         WHERE mg.status_ IN ('APPLY','PAY','PREPARE','PROGRESS') and mg.tenant_id_ = #{tenantId}
-        <if test="organId != null">
-            AND mg.organ_id_ = #{organId}
+        <if test="organId != null and organId != ''">
+            AND FIND_IN_SET(mg.organ_id_,#{organId})
         </if>
         ORDER BY mg.create_time_ DESC
     </select>

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupController.java

@@ -264,7 +264,7 @@ public class MusicGroupController extends BaseController {
 	@ApiOperation("获取分部乐团列表名称")
 	@GetMapping(value = "/queryOrganMusicInfos")
 	@PreAuthorize("@pcs.hasPermissions('musicGroup/queryOrganMusicInfos')")
-	public Object queryOrganMusicInfos(Integer organId) {
+	public Object queryOrganMusicInfos(String organId) {
 		return succeed(musicGroupService.queryOrganMusicInfos(organId));
 	}