Просмотр исходного кода

Merge branch 'saas_zx_2022-03-27' of http://git.dayaedu.com/yonge/mec into master_saas

zouxuan 3 лет назад
Родитель
Сommit
23dfb20759
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      mec-biz/src/main/resources/config/mybatis/CooperationOrganMapper.xml

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

@@ -206,7 +206,7 @@
         WHERE mg.status_ IN ('PROGRESS','PAUSE') AND co.id_ = #{cooperationOrganId} ORDER BY mg.create_time_ LIMIT 1
         WHERE mg.status_ IN ('PROGRESS','PAUSE') AND co.id_ = #{cooperationOrganId} ORDER BY mg.create_time_ LIMIT 1
     </select>
     </select>
     <select id="findFirstMusic" resultType="java.util.Map">
     <select id="findFirstMusic" resultType="java.util.Map">
-        SELECT mg.cooperation_organ_id_ 'key',mg.name_ 'value' FROM music_group mg
+        SELECT mg.cooperation_organ_id_ 'key',mg.id_ 'value' FROM music_group mg
         LEFT JOIN (SELECT co.id_,MIN(mg.create_time_) create_time_ FROM cooperation_organ co
         LEFT JOIN (SELECT co.id_,MIN(mg.create_time_) create_time_ FROM cooperation_organ co
         LEFT JOIN music_group mg ON mg.cooperation_organ_id_ = co.id_
         LEFT JOIN music_group mg ON mg.cooperation_organ_id_ = co.id_
         WHERE co.del_flag_ = 0 AND mg.status_ IN ('PROGRESS','PAUSE')
         WHERE co.del_flag_ = 0 AND mg.status_ IN ('PROGRESS','PAUSE')