update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -121,9 +121,12 @@ public class MusicGroup {
 	@ApiModelProperty(value = "乐团图片",required = false)
 	private String img;
 	
-	@ApiModelProperty(value = "教学主任",required = false)
+	@ApiModelProperty(value = "乐队指导",required = false)
 	private Integer directorUserId;
 
+	@ApiModelProperty(value = "乐队指导",required = false)
+	private String directorUserName;
+
 	@ApiModelProperty(value = "乐团创建人",required = false)
 	private Integer operatorUserId;
 
@@ -144,6 +147,14 @@ public class MusicGroup {
 	
 	private OwnershipType ownershipType;
 
+	public String getDirectorUserName() {
+		return directorUserName;
+	}
+
+	public void setDirectorUserName(String directorUserName) {
+		this.directorUserName = directorUserName;
+	}
+
 	public Date getExpectStartGroupDate() {
 		return expectStartGroupDate;
 	}

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

@@ -1653,6 +1653,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         musicGroup.setEducationalTeacherName(teacherDao.queryNameById(musicGroup.getEducationalTeacherId()));
         musicGroup.setTeamTeacherName(teacherDao.queryNameById(musicGroup.getTeamTeacherId()));
+        musicGroup.setDirectorUserName(teacherDao.queryNameById(musicGroup.getDirectorUserId()));
         Organization organization = organizationDao.get(musicGroup.getOrganId());
         if(organization != null){
             musicGroup.setOrganName(organization.getName());

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

@@ -430,7 +430,7 @@
         <include refid="queryTeacherAttendanceSql"/>
     </select>
     <select id="queryNameById" resultType="java.lang.String">
-        select real_name_ FROM sys_user s WHERE id_ = #{userId}
+        select real_name_ FROM sys_user s WHERE id_ = #{userId} LIMIT 1
     </select>
     <resultMap id="musicGroupStudentApplyDto" type="com.ym.mec.biz.dal.dto.musicGroupStudentApplyDto">
         <result property="userId" column="user_id_"/>