diff --git a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java
index d86d86f7..93df1ea0 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/SchoolClassController.java
@@ -74,8 +74,11 @@ public class SchoolClassController extends BaseController {
     /* 前端接口 */
     @GetMapping(API + "/getList.do")
     @ResponseBody
-    public JsonResult<List<SchoolClass>> getList(SchoolClassQuery param) {
-        List<SchoolClass>list = schoolClassService.getValuesByQueryNotWithPermission(param);
+    public JsonResult<List<SchoolClass>> getList(SchoolClassQuery condition, @SCoreUser CoreUser coreUser) {
+        if (!coreUser.isAdmin()) {
+            condition.setOrgId(coreUser.getOrgId());
+        }
+        List<SchoolClass>list = schoolClassService.getValuesByQueryNotWithPermission(condition);
         return  JsonResult.success(list);
     }
 
@@ -154,11 +157,12 @@ public class SchoolClassController extends BaseController {
     @Function("schoolClass.query")
     @ResponseBody
     public JsonResult<PageQuery> list(SchoolClassQuery condition,@SCoreUser CoreUser coreUser){
-        condition.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?coreUser.getOrgId():null);
-
         PageQuery page = condition.getPageQuery();
         schoolClassService.queryByCondition(page);
 
+        if (!coreUser.isAdmin()) {
+            condition.setOrgId(coreUser.getOrgId());
+        }
         Map<String,Object>map = new HashMap<>();
         map.put("count",page.getTotalRow());
         map.put("data",page.getList());
@@ -235,8 +239,11 @@ public class SchoolClassController extends BaseController {
 
     @GetMapping(MODEL + "/getValues.json")
     @ResponseBody
-    public JsonResult<List<SchoolClass>>getValues(SchoolClassQuery param) {
-        List<SchoolClass>list = schoolClassService.getValues(param);
+    public JsonResult<List<SchoolClass>>getValues(SchoolClassQuery condition, @SCoreUser CoreUser coreUser) {
+        if (!coreUser.isAdmin()) {
+            condition.setOrgId(coreUser.getOrgId());
+        }
+        List<SchoolClass>list = schoolClassService.getValues(condition);
         return  JsonResult.success(list);
     }
 
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionTagController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionTagController.java
index 45442c69..a75a10c1 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionTagController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionTagController.java
@@ -219,8 +219,11 @@ public class TeacherOpenCourseScheduleSessionTagController{
     @GetMapping(MODEL + "/getValues.json")
     @Function("teacherOpenCourseScheduleSessionTag.query")
     @ResponseBody
-    public JsonResult<List<TeacherOpenCourseScheduleSessionTag>>getValues(TeacherOpenCourseScheduleSessionTagQuery param) {
-        List<TeacherOpenCourseScheduleSessionTag>list = teacherOpenCourseScheduleSessionTagService.getValuesByQuery(param);
+    public JsonResult<List<TeacherOpenCourseScheduleSessionTag>>getValues(TeacherOpenCourseScheduleSessionTagQuery condition, @SCoreUser CoreUser coreUser) {
+        if (!coreUser.isAdmin()) {
+            condition.setOrgId(coreUser.getOrgId());
+        }
+        List<TeacherOpenCourseScheduleSessionTag>list = teacherOpenCourseScheduleSessionTagService.getValuesByQuery(condition);
         return  JsonResult.success(list);
     }