1、陪练课调整

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

@@ -1787,24 +1787,28 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         }
         applyTimes += 1;
 
+        SysUser sysUser = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
+
         practiceGroup.setCoursesStartDate(allCourseDates.get(0));
         practiceGroup.setCoursesExpireDate(DateUtil.addMinutes(allCourseDates.get(3), practiceCourseMinutes));
         Teacher teacher = teacherService.getDetail(practiceGroup.getUserId());
         if(Objects.isNull(teacher)){
-            throw new BizException("教师不存在");
+            throw new BizException("老师不存在");
         }
-        Employee employee = employeeDao.get(practiceGroup.getUserId());
-        if (Objects.isNull(employee) || StringUtils.isEmpty(employee.getOrganIdList()) || employee.getOrganIdList().contains(",")) {
-            practiceGroup.setOrganId(teacher.getTeacherOrganId());
-        } else {
-            practiceGroup.setOrganId(Integer.parseInt(employee.getOrganIdList()));
+
+        List<SimpleUserDto> enableApplyTeachers = getEnableApplyTeachers(practiceGroup.getUserId(), practiceGroup.getSubjectId());
+        Set<Integer> enableApplyTeacherIds = enableApplyTeachers.stream().map(SimpleUserDto::getUserId).collect(Collectors.toSet());
+        if(!enableApplyTeacherIds.contains(practiceGroup.getUserId())){
+            throw new BizException("预约失败，老师选择错误，请重试。");
         }
+
+        practiceGroup.setOrganId(sysUser.getOrganId());
+
         Subject subject = subjectDao.get(practiceGroup.getSubjectId());
         if (Objects.isNull(subject)) {
             result.put("status", "DISABLE_SUBJECT");
             return result;
         }
-        SysUser sysUser = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
         practiceGroup.setName(subject.getName() + "•" + sysUser.getUsername());
         practiceGroup.setSingleClassMinutes(practiceCourseMinutes);
         practiceGroupDao.insert(practiceGroup);