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

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

@@ -857,6 +857,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("请指定vip课程");
 		}
 		VipGroupManageDetailDto vipGroupBaseInfo = vipGroupDao.getVipGroupBaseInfo(vipGroupId);
+		if(Objects.nonNull(vipGroupBaseInfo.getEducationalTeacherId())){
+			SysUser eduUser = sysUserFeignService.queryUserById(vipGroupBaseInfo.getEducationalTeacherId());
+			if(Objects.nonNull(eduUser)){
+				vipGroupBaseInfo.setEducationalTeacherName(eduUser.getRealName());
+			}
+		}
 		vipGroupBaseInfo.setSubjectName(StringUtils.join(subjectDao.findBySubIds(vipGroupBaseInfo.getSubjectIdList()),","));
 		ClassGroupTeacherSalary byVipGoupAndTeacher = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupBaseInfo.getUserId());
 		Integer onlineNum = courseScheduleDao.countCourseNum(vipGroupId,"ONLINE");

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

@@ -195,7 +195,7 @@ public class TeacherController extends BaseController {
         if (!sysUser.getIsSuperAdmin()) {
             Teacher teacher = teacherService.get(sysUser.getId());
             if (StringUtils.isEmpty(organIds)) {
-                organIds = teacher.getOrganId() + "";
+                organIds = teacher.getTeacherOrganId() + "";
             }
             if(StringUtils.isNotBlank(teacher.getFlowOrganRange())){
                 organIds = organIds + "," + teacher.getFlowOrganRange();