diff --git a/VOL.Business/Services/HomeWork/S_HomeWorkService.cs b/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
index 843654c..afb3fb7 100644
--- a/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
+++ b/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.Extensions.DependencyInjection;
+using Quartz.Util;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -54,14 +55,18 @@ namespace VOL.Business.Services.Norm
             var res = new PageDataDto<HomeWorkListModel>();
             var currentTime = DateTime.Now;
 
-            string school = "";
+            string schoolCode = "";
 
-            if (string.IsNullOrWhiteSpace(paramDto.SchoolCode))
+            if (!string.IsNullOrWhiteSpace(paramDto.SchoolCode))
             {
-                school = UserContext.Current.TenantId;
+                schoolCode = paramDto.SchoolCode;
+            }
+            else
+            {
+                schoolCode = UserContext.Current.TenantId;
             }
 
-            var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode == school)
+            var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode == schoolCode)
                         select new HomeWorkListModel()
                         {
                             WorkId = s.Id,
diff --git a/VOL.Business/Services/Training/I_TrainingDataService.cs b/VOL.Business/Services/Training/I_TrainingDataService.cs
index 7027d10..d5e0b8d 100644
--- a/VOL.Business/Services/Training/I_TrainingDataService.cs
+++ b/VOL.Business/Services/Training/I_TrainingDataService.cs
@@ -1996,15 +1996,19 @@ namespace VOL.Business.Services.Training
         {
             var res = new PageDataDto<ClassReportModel>();
 
-            string school = "";
+            string schoolCode = "";
 
-            if (string.IsNullOrWhiteSpace(paramDto.SchoolCode))
+            if (!string.IsNullOrWhiteSpace(paramDto.SchoolCode))
             {
-                school = UserContext.Current.TenantId;
+                schoolCode = paramDto.SchoolCode;
+            }
+            else
+            {
+                schoolCode = UserContext.Current.TenantId;
             }
 
             var query = from td in _teacherRepository.DbContext.Set<Ai_ClassRoomRecord>()
-                        where td.SchoolCode.Equals(school)
+                        where td.SchoolCode.Equals(schoolCode)
                         select new ClassReportModel()
                         {
                             Id = td.Id,
@@ -2127,15 +2131,17 @@ namespace VOL.Business.Services.Training
         public async Task<GetStudentClassReportDetailsModel> GetStudentClassReportDetails(GetStudentClassReportDetailsDto paramDto)
         {
             var res = new GetStudentClassReportDetailsModel();
-
             string schoolCode = "";
 
-            if (string.IsNullOrWhiteSpace(paramDto.SchoolCode))
+            if (!string.IsNullOrWhiteSpace(paramDto.SchoolCode))
+            {
+                schoolCode = paramDto.SchoolCode;
+            }
+            else
             {
                 schoolCode = UserContext.Current.TenantId;
             }
 
-
             var query = from hrd in _teacherRepository.DbContext.Set<Ai_HeartRateData>()
                         where hrd.SchoolCode == schoolCode &&
                               hrd.ClassRoomRecordId == paramDto.ClassRoomRecordId &&