diff --git a/VOL.Business/Services/HomeWork/S_HomeWorkService.cs b/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
index 57f55c6..9cdb860 100644
--- a/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
+++ b/VOL.Business/Services/HomeWork/S_HomeWorkService.cs
@@ -53,7 +53,7 @@ namespace VOL.Business.Services.Norm
         {
             var res = new PageDataDto<HomeWorkListModel>();
 
-            var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode.Equals(UserContext.Current.TenantId))
+            var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode == UserContext.Current.TenantId)
                         select new HomeWorkListModel()
                         {
                             WorkId = s.Id,
@@ -113,7 +113,7 @@ namespace VOL.Business.Services.Norm
         {
             var res = new PageDataDto<HomeWorkStudentsModel>();
 
-            var query = from s in _homeWorkStudentsRepository.FindAsIQueryable(x => x.SchoolCode.Equals(UserContext.Current.TenantId) && x.HomeWorkId == paramDto.HomeWorkId)
+            var query = from s in _homeWorkStudentsRepository.FindAsIQueryable(x => x.HomeWorkId == paramDto.HomeWorkId)
                         select new HomeWorkStudentsModel()
                         {
                             WorkId = s.HomeWorkId,
@@ -130,6 +130,7 @@ namespace VOL.Business.Services.Norm
                  .Skip((paramDto.PageIndex - 1) * paramDto.PageSize)
                  .Take(paramDto.PageSize)
                  .ToListAsync();
+
             res.Datas = list;
 
             return res;
@@ -138,7 +139,7 @@ namespace VOL.Business.Services.Norm
         public async Task<List<SubmittedAssignmentsModel>> GetSubmittedAssignments(int homeWorkId, string studentNo)
         {
             var res = await _submittedAssignmentsRepository
-                .FindAsIQueryable(x => x.SchoolCode.Equals(UserContext.Current.TenantId) &&
+                .FindAsIQueryable(x => x.SchoolCode == UserContext.Current.TenantId &&
                 x.HomeWorkId == homeWorkId &&
                 x.StudentNo == studentNo)
                 .Select(x => new SubmittedAssignmentsModel()