update

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

@@ -24,7 +24,6 @@ import com.ym.mec.jiari.JiaRiFeignService;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateConvertor;
 import com.ym.mec.util.date.DateUtil;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -2616,14 +2615,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         ClassGroup classGroup = classGroupDao.get(groupId);
         if(classGroup != null){
             classGroup.setViewGroupName(classGroup.getName());
+            classGroup.setName(StringUtils.isEmpty(classGroup.getGroupName())?classGroup.getName():classGroup.getGroupName());
             if(classGroup.getGroupType() == GroupType.MUSIC){
                 MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
                 if(musicGroup != null){
                     classGroup.setMusicGroupName(musicGroup.getName());
-                    classGroup.setName(musicGroup.getName() + " " + (StringUtils.isEmpty(classGroup.getGroupName())?classGroup.getName():classGroup.getGroupName()));
                 }
-            }else {
-                classGroup.setName(StringUtils.isEmpty(classGroup.getGroupName())?classGroup.getName():classGroup.getGroupName());
             }
         }
         return classGroup;