Просмотр исходного кода

fix 订单导出显示福袋活动

周箭河 5 лет назад
Родитель
Сommit
b7790a9d29

+ 6 - 5
mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -3,13 +3,11 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
+import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dto.CoursePostponeDto;
 import com.ym.mec.biz.dal.dto.CreateCourseScheduleDto;
 import com.ym.mec.biz.dal.dto.VipGroupCourseAdjustInfoDto;
-import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
-import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
@@ -59,6 +57,8 @@ public class CourseScheduleController extends BaseController {
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private MusicGroupService musicGroupService;
+    @Autowired
+    private EmployeeDao employeeDao;
 
     @ApiOperation(value = "排课")
     @PostMapping("/batchAddCourseSchedule")
@@ -279,8 +279,9 @@ public class CourseScheduleController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
+        Employee employee = employeeDao.get(sysUser.getId());
         if(StringUtils.isEmpty(queryInfo.getOrganIdList())){
-            queryInfo.setOrganIdList(sysUser.getOrganId());
+            queryInfo.setOrganIdList(employee.getOrganIdList());
         }
         return succeed(scheduleService.endFindCourseSchedules(queryInfo));
     }