活动排课

mec-web/src/main/java/com/ym/mec/web/controller/education/ActivityController.java

@@ -83,8 +83,12 @@ public class ActivityController extends BaseController {
         ActivityWaitCourseStudentNumDto courseStudentNum = vipGroupActivityService.getActivityWaitCourseStudentNum(null, activityId);
         VipGroupActivity vipGroupActivity = courseStudentNum.getVipGroupActivity();
         Employee employee = employeeDao.get(sysUser.getId());
-        List<String> employeeOrgans = Arrays.asList(employee.getOrganIdList().split(","));
         List<String> activityOrgans = Arrays.asList(vipGroupActivity.getOrganId().split(","));
+        if(StringUtils.isEmpty(employee.getOrganIdList())){
+            courseStudentNum.setEmployeeAndActivityOrganIds(StringUtils.join(activityOrgans,","));
+            return succeed(courseStudentNum);
+        }
+        List<String> employeeOrgans = Arrays.asList(employee.getOrganIdList().split(","));
         employeeOrgans.retainAll(activityOrgans);
         courseStudentNum.setEmployeeAndActivityOrganIds(StringUtils.join(employeeOrgans,","));
         return succeed(courseStudentNum);