zouxuan 5 년 전
부모
커밋
f96daf7ee8
1개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 6 3
      mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

+ 6 - 3
mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -192,13 +192,16 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "导出学员是否有课")
     @PostMapping("export/studentHasCourse")
     @PreAuthorize("@pcs.hasPermissions('export/studentHasCourse')")
-    public void studentHasCourse(HttpServletResponse response) {
+    public void studentHasCourse(HttpServletResponse response,String organId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             throw new BizException("获取用户信息失败");
         }
-        Employee employee = employeeDao.get(sysUser.getId());
-        List<StudentHasCourseDto> hasCourseDtos = studentManageService.queryHasCourseStudent(employee.getOrganIdList());
+        if(StringUtils.isEmpty(organId)){
+            Employee employee = employeeDao.get(sysUser.getId());
+            organId = employee.getOrganIdList();
+        }
+        List<StudentHasCourseDto> hasCourseDtos = studentManageService.queryHasCourseStudent(organId);
         try {
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"学员编号", "姓名", "分部", "所在乐团", "乐团所属声部", "所在vip课","是否激活","是否预约"}, new String[]{
                     "userId", "userName", "organName", "musicGroupName", "subjectName", "vipGroupName","isActive.msg","isMake.msg"}, hasCourseDtos);