Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -104,7 +104,7 @@
         LEFT JOIN sys_role_menu srm ON sur.role_id_ = srm.role_id_
         LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_
         <include refid="queryTree"/>
---         GROUP BY sm.id_
+        GROUP BY sm.id_
         ORDER BY sm.sort_ DESC
         <include refid="global.limit"/>
     </select>
@@ -157,6 +157,7 @@
         LEFT JOIN sys_role_menu srm ON sur.role_id_ = srm.role_id_
         LEFT JOIN sys_menu sm ON srm.menu_id_ = sm.id_
         <include refid="queryTree"/>
+        GROUP BY sm.id_
         ORDER BY sm.sort_ DESC
     </select>
 

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

@@ -98,14 +98,6 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<ClassGroupTeachersDto> findClassGroupByMusicGroupId(@Param("musicGroupId") String musicGroupId, @Param("type") String type, @Param("classGroupId") Integer classGroupId);
 
     /**
-     * 获取学生所购买课程列表
-     *
-     * @param params
-     * @return
-     */
-    List<CourseListDto> queryCoursePage(Map<String, Object> params);
-
-    /**
      * 获取学员所在群组信息
      *
      * @param userId

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

@@ -382,7 +382,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 }
                 classGroupTeacherMapper.setTeacherDefaultMusicGroupSalaryList(teacherSalaryByUserIdAndType);
             }
-
         }
         return classGroupAndTeachers;
     }
@@ -395,12 +394,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         MapUtil.populateMap(params, queryInfo);
         params.put("userId",userId);
         List<CourseListDto> courseListDtos = null;
-//        int count = classGroupDao.countCoursePage(params);
-//        Integer vipCoursesNum = classGroupDao.countStudentVipCourses(userId);
-//        Integer coursesNum = classGroupDao.countStudentMusicGroupCourses(userId);
-//        int count = vipCoursesNum == null?0:vipCoursesNum + (coursesNum==null?0:coursesNum);
-//        if (count > 0) {
-//        pageInfo.setTotal(count);
         //获取分页前的所有的乐团编号和vip编号
         params.put("offset", pageInfo.getOffset());
         List<String> musicGroupIds = courseScheduleDao.queryMusicGroupIds(params);
@@ -416,7 +409,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //获取所有教学点名称列表
         Set<Integer> schoolIds = courseListDtos.stream().map(CourseListDto::getTeacherSchoolId).collect(Collectors.toSet());
         Map<Integer,String> schoolNames = MapUtil.convertMybatisMap(schoolDao.queryNameByIds(StringUtils.join(schoolIds,",")));
-//            courseListDtos = classGroupDao.queryCoursePage(params);
+
         courseListDtos.forEach(e -> {
             e.setAddress(schoolNames.get(e.getTeacherSchoolId()));
             if (ClassGroupTypeEnum.VIP == e.getType()) {
@@ -433,7 +426,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
         });
         pageInfo.setTotal(courseListDtos.size());
-//        }
         if (courseListDtos.size() == 0) {
             courseListDtos = new ArrayList<>();
         }

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

@@ -233,36 +233,6 @@
         AND del_flag_ = 0
     </select>
 
-    <select id="queryCoursePage" resultMap="CourseListDto">
-        <!--SELECT * FROM (
-        SELECT cg.type_,s.address_,mg.name_ music_group_name_,
-        cg.total_class_times_,cg.current_class_times_,'' single_class_minutes_,mg.id_
-        music_group_id_,
-        0 online_classes_num_,
-        0 offline_classes_num_,
-        cg.create_time_
-        FROM student_registration sr
-        LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
-        LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
-        LEFT JOIN school s ON mg.school_id_ = s.id_
-        WHERE sr.user_id_ = #{search} AND cg.type_ != 'VIP'
-        UNION ALL
-        SELECT cg.type_,ts.address_,vg.name_ music_group_name_,
-        cg.total_class_times_,cg.current_class_times_,vg.single_class_minutes_,vg.id_
-        music_group_id_,
-        IF(vg.online_classes_num_ IS NULL,0,vg.online_classes_num_) online_classes_num_,
-        IF(vg.offline_classes_num_ IS NULL,0,vg.offline_classes_num_) offline_classes_num_,
-        cg.create_time_
-        FROM class_group_student_mapper cgsm
-        LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_
-        LEFT JOIN vip_group_class_group_mapper vgcgm ON vgcgm.class_group_id_ = cgsm.class_group_id_
-        LEFT JOIN vip_group vg ON vg.id_ = vgcgm.vip_group_id_
-        LEFT JOIN school ts ON vg.teacher_school_id_ = ts.id_
-        WHERE cgsm.user_id_ = #{search} AND cg.type_ = 'VIP') a
-        ORDER BY a.create_time_ DESC
-        <include refid="global.limit"/>-->
-    </select>
-
     <resultMap id="imGroupModel" type="com.ym.mec.common.entity.ImGroupModel">
         <result column="id_" property="id"/>
         <result column="name_" property="name"/>