Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_0208

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStudentPaymentDao.java

@@ -558,7 +558,7 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
     * @author zx
     * @date 2021/11/5 11:30
     */
-    boolean hasCourse(@Param("organId") String organId, @Param("tenantId") Integer tenantId);
+    Boolean hasCourse(@Param("organId") String organId, @Param("tenantId") Integer tenantId);
 
     /**
     * @description:  报表中心学员小课记录导出

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

@@ -1304,8 +1304,8 @@ public class ExportController extends BaseController {
     @RequestMapping("export/studentVipPractice")
     @PreAuthorize("@pcs.hasPermissions('export/studentVipPractice')")
     public HttpResponseResult exportStudentVipPractice(String organId) throws IOException {
-        boolean hasCourse = courseScheduleStudentPaymentDao.hasCourse(organId, TenantContextHolder.getTenantId());
-        if (!hasCourse) {
+        Boolean hasCourse = courseScheduleStudentPaymentDao.hasCourse(organId, TenantContextHolder.getTenantId());
+        if (hasCourse == null || !hasCourse) {
             return failed("没有可导出的数据");
         }
         Integer tenantId = TenantContextHolder.getTenantId();