zouxuan 5 år sedan
förälder
incheckning
09026ed7da

+ 1 - 1
mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -187,7 +187,7 @@
         <result property="portrait" column="avatar_"/>
     </resultMap>
     <select id="getBasic" resultMap="ImUserModel">
-        select CASE WHEN user_type_ LIKE '%STUDENT%' THEN username_ ELSE real_name_ END username_,id_,avatar_
+        select CASE WHEN user_type_ LIKE '%TEACHER%' OR user_type_ LIKE '%SYSTEM%' THEN real_name_ ELSE username_ END username_,id_,avatar_
         from sys_user where id_ = #{userId} LIMIT 1
     </select>
     

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

@@ -210,7 +210,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		if(studentIds.size() > 0){
 			teachers.addAll(teacherDao.queryTeacherBaseInfo(studentIds,search));
 		}
-		return teachers;
+		return teachers.stream().distinct().collect(Collectors.toList());
 	}
 
     @Override