zouxuan 5 år sedan
förälder
incheckning
d1dd576a80

+ 12 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ClassGroup.java

@@ -44,6 +44,10 @@ public class ClassGroup {
 	@ApiModelProperty(value = "群名称", required = true)
 	private String groupName;
 
+	/** 群名称 */
+	@ApiModelProperty(value = "群名称", required = true)
+	private String viewGroupName;
+
 	/** 乐团名称 */
 	@ApiModelProperty(value = "乐团名称", required = true)
 	private String musicGroupName;
@@ -83,6 +87,14 @@ public class ClassGroup {
 	@ApiModelProperty(value = "班级图标",required = false)
 	private String img;
 
+	public String getViewGroupName() {
+		return viewGroupName;
+	}
+
+	public void setViewGroupName(String viewGroupName) {
+		this.viewGroupName = viewGroupName;
+	}
+
 	public String getMusicGroupName() {
 		return musicGroupName;
 	}

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

@@ -2615,6 +2615,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     public ClassGroup findGroupById(Integer groupId) {
         ClassGroup classGroup = classGroupDao.get(groupId);
         if(classGroup != null){
+            classGroup.setViewGroupName(classGroup.getName());
             if(classGroup.getGroupType() == GroupType.MUSIC){
                 MusicGroup musicGroup = musicGroupDao.get(classGroup.getMusicGroupId());
                 if(musicGroup != null){