Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/service/DefaultUserDetailsService.java

@@ -63,8 +63,9 @@ public class DefaultUserDetailsService implements UserDetailsService {
 
 		if (authorities == null) {
 			authorities = new ArrayList<>();
-			authorities.add(new SimpleGrantedAuthority(StringUtils.lowerCase(userType)));
 		}
+		
+		authorities.add(new SimpleGrantedAuthority(StringUtils.lowerCase(userType)));
 
 		for (String role : roles) {
 			authorities.add(new SimpleGrantedAuthority(StringUtils.lowerCase(role)));

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

@@ -204,4 +204,11 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     int countSporadicPage(Map<String, Object> params);
 
     List<OrderStatisDto> getLuckStatis();
+    
+    /**
+     * 统计收入信息
+     * @param organId
+     * @return
+     */
+    Map<String, Object> queryIncomeStatistics(@Param("organId") String organId);
 }

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

@@ -5,7 +5,6 @@ import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
-
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -232,4 +231,13 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
     List<TeacherBasicDto> searchTeachers(Map<String, Object> params);
+
+    /**
+     * 获取教师列表
+     * @param params
+     * @return
+     */
+    int countTeacherName(Map<String, Object> params);
+
+    List<Teacher> queryPageName(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TeacherMusicClassQueryInfo.java

@@ -0,0 +1,18 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class TeacherMusicClassQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "乐团状态",required = true)
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TeacherNameQueryInfo.java

@@ -0,0 +1,48 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class TeacherNameQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "教师编号",required = true)
+    private Integer teacherId;
+
+    private String organId;
+
+    private String subjectIds;
+
+    private String jobNature;
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public String getSubjectIds() {
+        return subjectIds;
+    }
+
+    public void setSubjectIds(String subjectIds) {
+        this.subjectIds = subjectIds;
+    }
+
+    public String getJobNature() {
+        return jobNature;
+    }
+
+    public void setJobNature(String jobNature) {
+        this.jobNature = jobNature;
+    }
+}

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

@@ -99,7 +99,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param queryInfo
      * @return
      */
-    PageInfo<TeacherMusicClassInfoDto> getTeacherMusicClass(QueryInfo queryInfo);
+    PageInfo<TeacherMusicClassInfoDto> getTeacherMusicClass(TeacherMusicClassQueryInfo queryInfo);
 
     /**
      * 获取老师VIP课程信息列表

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

@@ -136,4 +136,11 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @return
      */
     List<Teacher> findTeacherByOrganId(String organId,String subjectIds,String jobNature);
+
+    /**
+     * 分页获取教师列表
+     * @param queryInfo
+     * @return
+     */
+    PageInfo<Teacher> queryPageName(TeacherNameQueryInfo queryInfo);
 }

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

@@ -414,7 +414,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 	}
 
     @Override
-    public PageInfo<TeacherMusicClassInfoDto> getTeacherMusicClass(QueryInfo queryInfo) {
+    public PageInfo<TeacherMusicClassInfoDto> getTeacherMusicClass(TeacherMusicClassQueryInfo queryInfo) {
         PageInfo<TeacherMusicClassInfoDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
@@ -2148,7 +2148,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (Objects.isNull(classGroup)) {
             throw new BizException("班级不存在");
         }
-        classGroup.setTotalClassTimes(classGroup.getTotalClassTimes() + num);
+        int totalClassTimes = classGroup.getTotalClassTimes() == null ? 0 : classGroup.getTotalClassTimes();
+        classGroup.setTotalClassTimes(totalClassTimes+ num);
         classGroup.setUpdateTime(new Date());
 
         classGroupDao.update(classGroup);

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

@@ -776,6 +776,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     throw new BizException(courseCheckInfo(newCourseSchedule, existCourseSchedule, existCourseScheduleIds, 1));
                 }
 
+                if (!existCourseSchedule.getGroupType().equals(newCourseSchedule.getGroupType()) || !existCourseSchedule.getMusicGroupId().equals(newCourseSchedule.getMusicGroupId())) {
+                    throw new BizException(courseCheckInfo(newCourseSchedule, existCourseSchedule, existCourseScheduleIds, 1));
+                }
+
                 if (isTeacherRepeat) {
                     courseScheduleIds.add(existCourseSchedule.getId());
                 }

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

@@ -418,6 +418,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             for (MusicGroupSubjectGoodsGroup goodsGroup : goodsGroups) {
                 if (goodsGroup.getType().equals(GoodsType.INSTRUMENT) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
                     goodsGroup.setPrice(musicOneSubjectClassPlan.getDepositFee());
+                    goodsGroup.setKitGroupPurchaseType(KitGroupPurchaseTypeEnum.LEASE);
                 }
                 if (goodsGroup.getType().equals(GoodsType.INSTRUMENT) && musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.FREE)) {
                     goodsGroup.setPrice(new BigDecimal(0));

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

@@ -332,6 +332,26 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
 	@Override
+	public PageInfo<Teacher> queryPageName(TeacherNameQueryInfo queryInfo) {
+		PageInfo<Teacher> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<Teacher> dataList = null;
+		int count = teacherDao.countTeacherName(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = teacherDao.queryPageName(params);
+		}
+		if (count == 0) {
+			dataList = new ArrayList<>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
+
+	@Override
 	public List<BasicUserDto> queryMusicGroupTeacher(String musicGroupId) {
 		if(Objects.isNull(musicGroupId)){
 			throw new BizException("请指定乐团");

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

@@ -219,6 +219,9 @@
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
         LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
         WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC'
+        <if test="status != null">
+            AND mg.status_ = #{status}
+        </if>
         <include refid="global.limit"/>
     </select>
 
@@ -481,6 +484,9 @@
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
         LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
         WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC'
+        <if test="status != null">
+            AND mg.status_ = #{status}
+        </if>
     </select>
     <select id="findStudentOrganIdsByClassGroup" resultType="int">
         SELECT

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

@@ -337,7 +337,7 @@
     </select>
     
   	<select id="queryOrganMusicGroupNum" resultType="map">
-    	select count(*) total,sum(case when status_ = 'PROGRESS' then 1 else 0 end) progress_num_,sum(case when status_ = 'PAUSE' then 1 else 0 end) pause_num_ from music_group
+    	select count(*) total,sum(case when status_ = 'PREPARE' then 1 else 0 end) prepare_num_,sum(case when status_ = 'PROGRESS' then 1 else 0 end) progress_num_,sum(case when status_ = 'PAUSE' then 1 else 0 end) pause_num_ from music_group
     	<where>
     		<if test="organId != null">
     			FIND_IN_SET(organ_id_,#{organId})

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

@@ -500,4 +500,12 @@
         SELECT o.name_ organName, SUM(spo.actual_amount_) money ,COUNT(spo.id_) nums FROM student_payment_order spo LEFT JOIN organization o ON o.id_=spo.organ_id_
         WHERE spo.type_='LUCK' AND spo.status_='SUCCESS' GROUP BY spo.organ_id_ ORDER BY nums DESC;
     </select>
+    
+    <select id="queryIncomeStatistics" resultType="map">
+    	select count(*) total,sum(actual_amount_) total_num_ from student_payment_order
+    	where actual_amount_ &gt; 0
+   		<if test="organId != null">
+   			and FIND_IN_SET(organ_id_,#{organId})
+   		</if>
+  	</select>
 </mapper>

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

@@ -558,11 +558,10 @@
     <select id="queryOrganTeacherNum" resultType="map">
         select count(*) total,sum(case when job_nature_ = 'PART_TIME' then 1 else 0 end) part_time_num_,sum(case when
         job_nature_ = 'FULL_TIME' then 1 else 0 end) full_time_num_ from teacher
-        <where>
+        where demission_date_ is not null
             <if test="organId != null">
-                FIND_IN_SET(organ_id_,#{organId})
+                and FIND_IN_SET(organ_id_,#{organId})
             </if>
-        </where>
     </select>
     <select id="findByFlowOrganRange" resultMap="Teacher">
         SELECT id_,CONCAT(IF(flow_organ_range_ IS NULL OR flow_organ_range_ = '',0,flow_organ_range_),",",
@@ -618,4 +617,34 @@
             AND su.real_name_ LIKE CONCAT('%',#{teacherName},'%')
         </if>
     </select>
+    <select id="countTeacherName" resultType="java.lang.Integer">
+        SELECT COUNT(su.id_) FROM teacher t
+        LEFT JOIN sys_user su ON t.id_ = su.id_
+        WHERE su.del_flag_ != 1
+        <include refid="queryPageNameSql"/>
+    </select>
+    <sql id="queryPageNameSql">
+        <if test="organId != null">
+            AND FIND_IN_SET(t.organ_id_,#{organId})
+        </if>
+        <if test="subjectIds != null">
+            AND INTE_ARRAY(t.subject_id_,#{subjectIds})
+        </if>
+        <if test="jobNature != null">
+            AND t.job_nature_ = #{jobNature}
+        </if>
+        <if test="teacherId != null">
+            AND t.id_ = #{teacherId}
+        </if>
+        <if test="search != null">
+            AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
+        </if>
+    </sql>
+    <select id="queryPageName" resultMap="TeacherBasicDto">
+        SELECT su.id_,su.real_name_ FROM teacher t
+        LEFT JOIN sys_user su ON t.id_ = su.id_
+        WHERE su.del_flag_ != 1
+        <include refid="queryPageNameSql"/>
+        <include refid="global.limit"/>
+    </select>
 </mapper>

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -99,7 +99,7 @@ public class RoomServiceImpl implements RoomService {
         Teacher teacher = teacherDao.get(Integer.parseInt(userId));
         CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
         try {
-            if(teacher != null && teacher.getId() == courseSchedule.getActualTeacherId()){
+            if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
                 teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId),Integer.parseInt(userId), SignStatusEnum.SIGN_IN,true);
             }else {
                 studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL);
@@ -148,7 +148,7 @@ public class RoomServiceImpl implements RoomService {
             } else {
                 roleEnum = RoleEnum.RoleAudience;
             }*/
-            if(teacher != null && teacher.getId() == courseSchedule.getActualTeacherId()){
+            if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
                 roleEnum = RoleEnum.RoleTeacher;
             }else {
                 roleEnum = RoleEnum.RoleStudent;
@@ -242,9 +242,9 @@ public class RoomServiceImpl implements RoomService {
         SysUser user = sysUserFeignService.queryUserInfo();
         String userId = user.getId().toString();
         Teacher teacher = teacherDao.get(user.getId());
-        CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
+        CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
         try {
-            if(teacher != null && teacher.getId() == courseSchedule.getActualTeacherId()){
+            if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
                 teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), SignStatusEnum.SIGN_OUT,true);
             }
         }catch (Exception e){
@@ -1141,7 +1141,7 @@ public class RoomServiceImpl implements RoomService {
             Teacher teacher = teacherDao.get(sysUser.getId());
             CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId));
             try {
-                if(teacher != null && teacher.getId() == courseSchedule.getActualTeacherId()){
+                if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
                     teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
                 }
             }catch (Exception e){

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherController.java

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
+import com.ym.mec.biz.dal.page.TeacherMusicClassQueryInfo;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
@@ -64,7 +65,7 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "获取老师乐团课程信息列表")
     @GetMapping("/getTeacherMusicClass")
     @ApiParam(value = "教师编号", required = true)
-    public Object getTeacherMusicClass(QueryInfo queryInfo){
+    public Object getTeacherMusicClass(TeacherMusicClassQueryInfo queryInfo){
         return succeed(classGroupService.getTeacherMusicClass(queryInfo));
     }
 

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/MessageSenderPluginContext.java

@@ -49,10 +49,10 @@ public class MessageSenderPluginContext implements ApplicationContextAware {
 		private static final long serialVersionUID = -3964872523891264522L;
 
 		{
-			put(JiguangPushPlugin.getName(), StringUtils.uncapitalize(JiguangPushPlugin.class.getSimpleName()));
-			put(MOxintongSMSPlugin.getName(), StringUtils.uncapitalize(MOxintongSMSPlugin.class.getSimpleName()));
-			put(ShiyuanSMSPlugin.getName(), StringUtils.uncapitalize(ShiyuanSMSPlugin.class.getSimpleName()));
-			put(YimeiSmsPlugin.getName(), StringUtils.uncapitalize(YimeiSmsPlugin.class.getSimpleName()));
+			put(StringUtils.lowerCase(JiguangPushPlugin.getName()), StringUtils.uncapitalize(JiguangPushPlugin.class.getSimpleName()));
+			put(StringUtils.lowerCase(MOxintongSMSPlugin.getName()), StringUtils.uncapitalize(MOxintongSMSPlugin.class.getSimpleName()));
+			put(StringUtils.lowerCase(ShiyuanSMSPlugin.getName()), StringUtils.uncapitalize(ShiyuanSMSPlugin.class.getSimpleName()));
+			put(StringUtils.lowerCase(YimeiSmsPlugin.getName()), StringUtils.uncapitalize(YimeiSmsPlugin.class.getSimpleName()));
 		}
 	};
 

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -37,7 +37,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 	private String reqURL = "https://api.jpush.cn/v3/push";// 请求极光地址
 
 	public static String getName() {
-		return "Jiguang";
+		return "jiguang";
 	}
 
 	/**
@@ -198,7 +198,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 
 	public static void main(String[] args) throws IOException {
 		
-		String str = "1048953,1048955,1048958,1048959,1048960,1048961,1048965,1048967,1048970,1048974,1048977,1048981,1048983,1048990,1048993,1048996,1048998,1048999,1049000,1049003,1049005,1049006,1049008,1049009,1049013,1049019,1049024,1049034,1049036,1049038,1049039,1049040,1049042,1049043,1049045,1049048,1049049,1049051,1049053,1049057,1049062,1049066,1049076,1049077,1049079,1049090,1049117,1049118,1049122,1049123,1049149,1049251,1049363,1049368,1049524,1055861,1055862,1055863,1055865,1056784,1084443,1094555,1094575";
+		String str = "2094588";
 		
 		
 		JiguangPushPlugin plugin = new JiguangPushPlugin();

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/MOxintongSMSPlugin.java

@@ -32,7 +32,7 @@ public class MOxintongSMSPlugin implements MessageSenderPlugin, InitializingBean
 	private String reqUrl;
 
 	public static String getName() {
-		return "MOxintong";
+		return "moxintong";
 	}
 
 	@Override

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/ShiyuanSMSPlugin.java

@@ -40,7 +40,7 @@ public class ShiyuanSMSPlugin implements MessageSenderPlugin, InitializingBean {
 	// private String extno = "";//扩展码(不用填写)
 
 	public static String getName() {
-		return "Shiyuan";
+		return "shiyuan";
 	}
 
 	@Override

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

@@ -152,7 +152,7 @@ public class CourseScheduleController extends BaseController {
     }
 
     @ApiOperation(value = "课时调整")
-    @PreAuthorize("@pcs.hasPermissions('courseSchedule/classStartDateAdjust')")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/classStartDateAdjust','system')")
     @PostMapping(value = "/classStartDateAdjust",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object classStartDateAdjust(CourseSchedule courseSchedule){
         CourseSchedule oldCourseSchedule = scheduleService.get(courseSchedule.getId());

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

@@ -47,6 +47,9 @@ public class IndexController extends BaseController {
 	
 	@Autowired
 	private SysUserCashAccountDetailDao sysUserCashAccountDetailDao;
+	
+	@Autowired
+	private StudentPaymentOrderDao studentPaymentOrderDao;
 
 	@ApiOperation(value = "获取首页数据")
 	@GetMapping("/index")
@@ -83,6 +86,8 @@ public class IndexController extends BaseController {
 		
 		Map<String, Object> incomeExpendMap = sysUserCashAccountDetailDao.queryStatistics(organId);
 		
+		Map<String, Object> incomeMap = studentPaymentOrderDao.queryIncomeStatistics(organId);
+		
 		ModelMap model = new ModelMap();
 		model.put("musicDatas", musicDatas);
 		model.put("teacherDatas", teacherDatas);
@@ -93,6 +98,7 @@ public class IndexController extends BaseController {
 		model.put("vipGroupNum", vipGroupNum);
 		model.put("demoGroupNum", demoGroupNum);
 		model.put("incomeExpendMap", incomeExpendMap);
+		model.put("incomeMap", incomeMap);
 
 		return succeed(model);
 	}

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

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.ClassGroupService;
@@ -140,6 +141,30 @@ public class TeacherController extends BaseController {
         return succeed(teacherService.findTeacherByOrganId(organId,subjectIds,jobNature));
     }
 
+    @ApiOperation(value = "分页获取教师名称编号列表")
+    @GetMapping("/queryNameList")
+    @PreAuthorize("@pcs.hasPermissions('teacher/queryNameList')")
+    public HttpResponseResult queryPageName(TeacherNameQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+                queryInfo.setOrganId(employee.getOrganIdList());
+            }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+                return failed("用户所在分部异常");
+            }else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                    return failed("非法请求");
+                }
+            }
+        }
+        return succeed(teacherService.queryPageName(queryInfo));
+    }
+
     @ApiOperation(value = "获取乐团所有老师")
     @GetMapping("/findMusicGroupTeachers")
     @PreAuthorize("@pcs.hasPermissions('teacher/findMusicGroupTeachers')")
@@ -166,7 +191,7 @@ public class TeacherController extends BaseController {
     @GetMapping("/getTeacherMusicClass")
     @ApiParam(value = "教师编号", required = true)
     @PreAuthorize("@pcs.hasPermissions('teacher/getTeacherMusicClass')")
-    public Object getTeacherMusicClass(QueryInfo queryInfo){
+    public Object getTeacherMusicClass(TeacherMusicClassQueryInfo queryInfo){
         return succeed(classGroupService.getTeacherMusicClass(queryInfo));
     }