Merge remote-tracking branch 'origin/master'

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

@@ -22,6 +22,7 @@
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <association property="musicGroup" javaType="com.ym.mec.biz.dal.entity.MusicGroup">
             <result column="music_group_name_" property="name"/>
+            <result column="organ_name_" property="organName"/>
             <result column="course_view_type_" property="courseViewType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         </association>
         <association property="user" javaType="com.ym.mec.auth.api.entity.SysUser">
@@ -109,10 +110,11 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupQuit" parameterType="map">
-        SELECT mgq.*,mg.name_ music_group_name_,su.username_,mg.course_view_type_
+        SELECT mgq.*,mg.name_ music_group_name_,su.username_,mg.course_view_type_,o.name_ organ_name_
         FROM music_group_quit mgq
         LEFT JOIN sys_user su ON su.id_ = mgq.user_id_
         LEFT JOIN music_group mg ON mg.id_ = mgq.music_group_id_
+        left join organization o on o.id_ = mg.organ_id_
         <include refid="queryPageSql"/>
         ORDER BY id_ desc
         <include refid="global.limit"/>

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

@@ -123,13 +123,13 @@ public class MusicGroupController extends BaseController {
 				return failed("非法请求");
 			}
 		}
-		if (sysUser.getIsSuperAdmin() == false) {
+		/*if (sysUser.getIsSuperAdmin() == false) {
 			List<Integer> userRole = employeeDao.queryUserRole(sysUser.getId());
 			// 如果当前用户只有教务老师角色，那么只能看到他所管理的课程组的信息
 			if (userRole != null && userRole.size() == 1 && userRole.contains(SysUserRole.EDUCATIONAL_TEACHER)) {
 				queryInfo.setEducationalTeacherId(sysUser.getId());
 			}
-		}
+		}*/
 		return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
 	}