导出修改

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

@@ -1447,8 +1447,6 @@ public class ExportServiceImpl implements ExportService {
     public HttpResponseResult exportStudentSubCourse(Map<String, Object> info, List<String> headColumns) {
         SysUser sysUser = sysUserService.getUser();
         String organId = organizationService.getEmployeeOrgan(sysUser.getId(), getParam(info, "organId", String.class), sysUser.getIsSuperAdmin());
-
-        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_STUDENT_SUBCOURSE, sysUser.getId());
         Integer tenantId = TenantContextHolder.getTenantId();
 
         List<ExportStudentSubCourse> rows = activityUserMapperService.exportStudentSubCourse(organId, tenantId);
@@ -1458,16 +1456,17 @@ public class ExportServiceImpl implements ExportService {
         if (rows.size() > 50000) {
             return BaseController.failed("数据集太大，不能导出.最大数据集不能超过50000");
         }
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_STUDENT_SUBCOURSE, sysUser.getId());
         return this.asyncExport(() -> this.queryStudentSubCourse(rows, managerDownload, headColumns, ExportEnum.EXPORT_STUDENT_SUBCOURSE),
                 managerDownload.getName());
     }
 
     private HttpResponseResult exportStudentServeInfo(Map<String, Object> info, List<String> headColumns) {
         SysUser sysUser = sysUserService.getUser();
+
         String organId = organizationService.getEmployeeOrgan(sysUser.getId(), getParam(info, "organId", String.class), sysUser.getIsSuperAdmin());
         info.put("organIds", organId);
 
-        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_STUDENT_SERVE_INFO, sysUser.getId());
         Integer tenantId = TenantContextHolder.getTenantId();
         info.put("tenantId", tenantId);
 
@@ -1478,6 +1477,7 @@ public class ExportServiceImpl implements ExportService {
         if (rows.size() > 50000) {
             return BaseController.failed("数据集太大，不能导出.最大数据集不能超过50000");
         }
+        ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.EXPORT_STUDENT_SERVE_INFO, sysUser.getId());
         return this.asyncExport(() -> this.queryStudentServeInfo(rows, managerDownload, headColumns, ExportEnum.EXPORT_STUDENT_SERVE_INFO),
                 managerDownload.getName());
     }