update

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

@@ -871,7 +871,7 @@
         SELECT mg.id_ musicGroupId,o.name_ organName,mg.name_ musicGroupName,mg.status_ musicGroupStatus,mg.course_view_type_ courseViewType FROM
         music_group mg
         LEFT JOIN organization o ON mg.organ_id_ = o.id_
-        WHERE status_ IN ('PRE_APPLY','PRE_BUILD_FEE','FEE_AUDIT','APPLY','PAY') and tenant_id_ = #{tenantId}
+        WHERE status_ IN ('PRE_APPLY','PRE_BUILD_FEE','FEE_AUDIT','APPLY','PAY') and mg.tenant_id_ = #{tenantId}
         <if test="organId != null">
             AND FIND_IN_SET(mg.organ_id_,#{organId})
         </if>

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

@@ -205,7 +205,7 @@ public class MusicGroupQuitController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('musicGroupQuit/quitMusicGroup')")
     public HttpResponseResult quitMusicGroup(@RequestBody MusicGroupQuit musicGroupQuit){
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
+		if (sysUser == null || sysUser.getId() == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
         List<SysUserRoleEnum> roleIds;
@@ -215,10 +215,13 @@ public class MusicGroupQuitController extends BaseController {
             roleIds.add(SysUserRoleEnum.EDUCATIONAL_TEACHER);
         } else {
             MusicGroup musicGroup = musicGroupService.get(musicGroupQuit.getMusicGroupId());
+            if(musicGroup == null){
+            	return failed("乐团信息查询失败");
+            }
             roleIds = organizationService.queryOrganRole(musicGroup.getOrganId(), sysUser.getId());
         }
 		if (!(roleIds.contains(SysUserRoleEnum.SECTION_MANAGER) || roleIds.contains(SysUserRoleEnum.EDUCATIONAL_TEACHER))) {
-			throw new BizException("未经授权，不能操作");
+			return failed("未经授权，不能操作");
 		}
         return succeed(musicGroupService.approveQuitMusicGroup(roleIds, musicGroupQuit));
     }