Merge remote-tracking branch 'origin/master'

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

@@ -72,7 +72,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param userIds
      * @return
      */
-    List<Teacher> findTeachers(@Param("userIds") List<Integer> userIds);
+    List<TeacherBasicDto> findTeachers(@Param("userIds") List<Integer> userIds);
 
     /**
      * count上课结算列表

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherBasicDto.java

@@ -0,0 +1,34 @@
+package com.ym.mec.biz.dal.dto;
+
+public class TeacherBasicDto {
+
+    private Integer id;
+
+    private String realName;
+
+    private String username;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}

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

@@ -74,7 +74,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<Teacher> findTeachers(@Param("organId") String organId);
+    List<TeacherBasicDto> findTeachers(@Param("organId") String organId);
 
     /**
      * @describe 根据科目获取部门下的教师

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

@@ -196,7 +196,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	}
 
     @Override
-    public List<Teacher> findTeachers(String organId) {
+    public List<TeacherBasicDto> findTeachers(String organId) {
 		List<Teacher> teacherList = teacherDao.findByFlowOrganRange(null);
 		if(StringUtils.isNotEmpty(organId)){
 			Set<String> list = new HashSet<>(Arrays.asList(organId.split(",")));

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

@@ -267,7 +267,12 @@
         select id_ `key`,phone_ `value` FROM sys_user s WHERE FIND_IN_SET(id_,#{userIds}) AND s.phone_ IS NOT NULL
     </select>
 
-    <select id="findTeachers" resultMap="Teacher">
+    <resultMap id="TeacherBasicDto" type="com.ym.mec.biz.dal.dto.TeacherBasicDto">
+        <result property="id" column="id_"/>
+        <result property="username" column="username_"/>
+        <result property="realName" column="real_name_"/>
+    </resultMap>
+    <select id="findTeachers" resultMap="TeacherBasicDto">
         SELECT su.id_,su.username_,su.real_name_ FROM sys_user su
         <where>
             <if test="userIds != null">