diff --git a/WGShare.API/Controllers/Frontend/HomeController.cs b/WGShare.API/Controllers/Frontend/HomeController.cs
index 03c4a87..0b6a8cd 100644
--- a/WGShare.API/Controllers/Frontend/HomeController.cs
+++ b/WGShare.API/Controllers/Frontend/HomeController.cs
@@ -63,8 +63,8 @@ namespace WGShare.API.Controllers.Frontend
 
             var list = await _sqlSugar.Queryable<Room>()
                 .Where(x => x.TenantId == TenantId && x.IsDelete == false)
-                .WhereIF(Year > 0, x => x.Year == Year || x.Year == 0)
-                .WhereIF(Subject > 0, x => x.Subject == Subject || x.Subject == 0)
+                .WhereIF(Year > 0 && RoleId == RoleEnums.User, x => x.Year == Year || x.Year == 0)
+                .WhereIF(Subject > 0 && RoleId == RoleEnums.User, x => x.Subject == Subject || x.Subject == 0)
                 .OrderBy(x => x.Id, OrderByType.Desc)
                 .ToPageListAsync(dto.PageIndex, dto.PageSize, total);
 
diff --git a/WGShare.API/Controllers/Frontend/UserController.cs b/WGShare.API/Controllers/Frontend/UserController.cs
index 2e01ebc..fe48d11 100644
--- a/WGShare.API/Controllers/Frontend/UserController.cs
+++ b/WGShare.API/Controllers/Frontend/UserController.cs
@@ -140,7 +140,7 @@ namespace WGShare.API.Controllers.Frontend
             var entity = updateDTOs.Adapt<List<User>>();
 
             return await _sqlSugar.Updateable(entity)
-                .UpdateColumns(x => new { x.RoleId, x.Subject, x.Year }).ExecuteCommandAsync() > 0;
+                .UpdateColumns(x => new { x.Subject, x.Year }).ExecuteCommandAsync() > 0;
         }
 
 
diff --git a/WGShare.Domain/DTOs/User/UserBatchUpdateDTO.cs b/WGShare.Domain/DTOs/User/UserBatchUpdateDTO.cs
index 405b24b..228e2ff 100644
--- a/WGShare.Domain/DTOs/User/UserBatchUpdateDTO.cs
+++ b/WGShare.Domain/DTOs/User/UserBatchUpdateDTO.cs
@@ -16,7 +16,6 @@ namespace WGShare.Domain.DTOs.User
         public string Id { get; set; }
 
         public int Year { get; set; }
-        public SubjectType Subject { get; set; }
-        public string RoleId { get; set; }
+        public SubjectType Subject { get; set; } 
     }
 }