Merge branch 'course_adjust'

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

@@ -2961,12 +2961,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				oldCourses.get(i).setTeachMode(courseAdjustInfo.getTeachMode());
 				if(VIP.equals(oldCourses.get(i).getGroupType())){
 					changeSalaryTeachTypes.add(TeachTypeEnum.BISHOP);
-					courseScheduleTeacherSalaryDao.deleteWithCourseAndTeachRole(Arrays.asList(oldCourses.get(i).getId()), TeachTypeEnum.BISHOP);
-					if(CollectionUtils.isEmpty(courseAdjustInfo.getClassGroupTeacherMapperList())){
-						ClassGroupTeacherMapper cgtm = new ClassGroupTeacherMapper();
-						cgtm.setUserId(oldCourses.get(i).getActualTeacherId());
-						cgtm.setTeacherRole(TeachTypeEnum.BISHOP);
-						courseAdjustInfo.getClassGroupTeacherMapperList().add(cgtm);
+					if(courseSalaryListMap.containsKey(oldCourses.get(i).getId())){
+						List<CourseScheduleTeacherSalary> ctss = courseSalaryListMap.get(oldCourses.get(i).getId());
+						for (CourseScheduleTeacherSalary teacherSalary : ctss) {
+							courseScheduleTeacherSalaryService.updateSingleCourseTeacherSalary(oldCourses.get(i), teacherSalary);
+						}
+						courseScheduleTeacherSalaryDao.batchUpdate(ctss);
 					}
 				}
 			}

mec-web/src/main/java/com/ym/mec/web/controller/PracticeGroupManageController.java

@@ -138,6 +138,21 @@ public class PracticeGroupManageController extends BaseController {
     @GetMapping("studentBuys")
     @PreAuthorize("@pcs.hasPermissions('practiceGroupManage/studentBuys')")
     public Object studentBuys(StudentBuyPracticeQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        } else if (StringUtils.isEmpty(employee.getOrganIdList())) {
+            return failed("用户所在分部异常");
+        } else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if (!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))) {
+                return failed("非法请求");
+            }
+        }
         return succeed(practiceGroupService.studentBuys(queryInfo));
     }
 }