Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -371,6 +371,13 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
     boolean delClassNoStartCourse(Integer classGroupId);
 
     /**
+     * 根据群编号，获取群组基本信息
+     * @param groupId
+     * @return
+     */
+    ClassGroup findGroupById(Integer groupId);
+
+    /**
      * @describe 终极班级信息获取
      * @author Joburgess
      * @date 2019/12/30

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

@@ -2239,4 +2239,19 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         pageInfo.setRows(results);
         return pageInfo;
     }
+
+
+    @Override
+    public ClassGroup findGroupById(Integer groupId) {
+        ClassGroup classGroup = classGroupDao.get(groupId);
+        if(classGroup != null){
+            if(classGroup.getGroupType() == GroupType.MUSIC){
+                MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
+                if(musicGroup != null){
+                    classGroup.setName(musicGroup.getName() + " " + classGroup.getName());
+                }
+            }
+        }
+        return classGroup;
+    }
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -74,7 +74,7 @@ public class TeacherManageController extends BaseController {
         if(null == groupId){
             return failed("参数校验错误");
         }
-        return succeed(classGroupService.get(groupId));
+        return succeed(classGroupService.findGroupById(groupId));
     }
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")