Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -631,6 +631,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					groupCoursesUnitPrice=MapUtil.convertIntegerMap(groupCoursesUnitPriceMaps);
 				}
 
+				List<Integer> organIds = dataList.stream().map(VipGroup::getOrganId).collect(Collectors.toList());
+				List<Organization> organs = organizationDao.findOrgans(organIds);
+				Map<Integer, String> organNameMap = new HashMap<>();
+				if(!CollectionUtils.isEmpty(organs)){
+					organNameMap = organs.stream().collect(Collectors.toMap(Organization::getId, o->o.getName(), (o1, o2)->o1));
+				}
+
 				Map<Integer, String> idNameMap=new HashMap<>();
 				if(!CollectionUtils.isEmpty(educationalTeacherIds)){
 					List<SimpleUserDto> educationalUsers = employeeDao.findByIds(educationalTeacherIds);
@@ -655,6 +662,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					Long aLong1 = currentClassTimeMap.get(vipGroup.getId() + "");
 					vipGroup.setCurrentClassTimes(aLong1==null?0:aLong1.intValue());
 
+					vipGroup.setOrganName(organNameMap.get(vipGroup.getOrganId()));
+
 					Long allStudentNum=groupStudentNumMap.get(vipGroup.getId().toString());
 					if(Objects.isNull(allStudentNum)){
 						allStudentNum=Long.valueOf(0);