yonge пре 4 година
родитељ
комит
09a87f9ced

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

@@ -43,6 +43,7 @@
     <resultMap id="Mapper" type="com.ym.mec.biz.dal.dto.Mapper">
         <result column="key_" property="key"/>
         <result column="value_" property="value"/>
+        <result column="courseScheduleId_" property="courseScheduleId"/>
     </resultMap>
 
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ClassGroup" useGeneratedKeys="true" keyColumn="id"
@@ -1534,8 +1535,8 @@
     </select>
     
     <select id="countTeacherByMusicGroupId" resultMap="Mapper">
-		select cg.name_ key_,GROUP_CONCAT(u.real_name_) value_ from class_group cg LEFT JOIN class_group_teacher_mapper cgtm on cg.id_ = cgtm.class_group_id_
+		select cg.id_ courseScheduleId_,cg.name_ key_,GROUP_CONCAT(u.real_name_) value_ from class_group cg LEFT JOIN class_group_teacher_mapper cgtm on cg.id_ = cgtm.class_group_id_
 		LEFT JOIN sys_user u on u.id_ = cgtm.user_id_
-		where cg.del_flag_ = 0 and cg.group_type_ = 'MUSIC' and cg.music_group_id_ = #{musicGroupId}  group by cg.name_ 
+		where cg.del_flag_ = 0 and cg.group_type_ = 'MUSIC' and cg.music_group_id_ = #{musicGroupId} order by cg.type_  group by cg.id_
     </select>
 </mapper>

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/CooperationOrganLinkmanMapper.xml

@@ -114,7 +114,7 @@
 	</select>
 	
 	<select id="queryByCooperationOrganId" resultMap="CooperationOrganLinkman">
-		SELECT * FROM cooperation_organ_linkman where cooperation_organ_id_ = #{cooperationOrganId} ORDER BY id_ desc
+		SELECT * FROM cooperation_organ_linkman where cooperation_organ_id_ = #{cooperationOrganId} ORDER BY id_ asc
 	</select>
 	
 	<delete id="deleteByCooperationOrganId">