diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java
index 5fe5613f..4e79ae5f 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java
@@ -58,7 +58,7 @@ public class TeacherOpenCourseController{
         }else{
 
             if (!coreUser.isAdmin()) {
-                condition.setOrgId(condition.getOrgId());
+                condition.setOrgId(coreUser.getOrgId());
             }
             PageQuery page = condition.getPageQuery();
             teacherOpenCourseService.queryByConditionQuery(page);
@@ -86,7 +86,7 @@ public class TeacherOpenCourseController{
             return JsonResult.failMessage("请登录后再操作");
         }else{
             if (!coreUser.isAdmin()) {
-                condition.setOrgId(condition.getOrgId());
+                condition.setOrgId(coreUser.getOrgId());
             }
             List<TeacherOpenCourse>list = teacherOpenCourseService.getValuesByQuery(condition);
             return  JsonResult.success(list);
@@ -170,7 +170,7 @@ public class TeacherOpenCourseController{
         PageQuery page = condition.getPageQuery();
 
         if (!coreUser.isAdmin()) {
-            condition.setOrgId(condition.getOrgId());
+            condition.setOrgId(coreUser.getOrgId());
         }
         teacherOpenCourseService.queryByCondition(page);
         return JsonResult.success(page);
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionClassController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionClassController.java
index fe0c383f..7a76e779 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionClassController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionClassController.java
@@ -51,7 +51,7 @@ public class TeacherOpenCourseScheduleSessionClassController{
             return JsonResult.failMessage("请登录后再操作");
         }else{
             if (!coreUser.isAdmin()) {
-                condition.setOrgId(condition.getOrgId());
+                condition.setOrgId(coreUser.getOrgId());
             }
             PageQuery page = condition.getPageQuery();
             teacherOpenCourseScheduleSessionClassService.queryByConditionQuery(page);
@@ -79,7 +79,7 @@ public class TeacherOpenCourseScheduleSessionClassController{
             return JsonResult.failMessage("请登录后再操作");
         }else{
             if (!coreUser.isAdmin()) {
-                condition.setOrgId(condition.getOrgId());
+                condition.setOrgId(coreUser.getOrgId());
             }
             List<TeacherOpenCourseScheduleSessionClass>list = teacherOpenCourseScheduleSessionClassService.getValuesByQuery(condition);
             return  JsonResult.success(list);
@@ -129,7 +129,7 @@ public class TeacherOpenCourseScheduleSessionClassController{
     public JsonResult<PageQuery> list(TeacherOpenCourseScheduleSessionClassQuery condition, @SCoreUser CoreUser coreUser){
         PageQuery page = condition.getPageQuery();
         if (!coreUser.isAdmin()) {
-            condition.setOrgId(condition.getOrgId());
+            condition.setOrgId(coreUser.getOrgId());
         }
         teacherOpenCourseScheduleSessionClassService.queryByCondition(page);
         return JsonResult.success(page);
@@ -148,7 +148,7 @@ public class TeacherOpenCourseScheduleSessionClassController{
             return JsonResult.failMessage("请登录后再操作");
         }else{
             if (!coreUser.isAdmin()) {
-                condition.setOrgId(condition.getOrgId());
+                condition.setOrgId(coreUser.getOrgId());
             }
             List<TeacherOpenCourseScheduleSessionClass>list = teacherOpenCourseScheduleSessionClassService.getLevelList(condition);
             return  JsonResult.success(list);
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java
index 72e6cc2c..ab7d6749 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java
@@ -67,7 +67,7 @@ public class TeacherOpenCourseScheduleSessionController{
             return JsonResult.failMessage("请登录后再操作");
         }else{
             if (!coreUser.isAdmin()) {
-                condition.setOrgId(condition.getOrgId());
+                condition.setOrgId(coreUser.getOrgId());
             }
             PageQuery page = condition.getPageQuery();
             teacherOpenCourseScheduleSessionService.queryByConditionQuery(page);
@@ -95,7 +95,7 @@ public class TeacherOpenCourseScheduleSessionController{
             return JsonResult.failMessage("请登录后再操作");
         }else{
             if (!coreUser.isAdmin()) {
-                condition.setOrgId(condition.getOrgId());
+                condition.setOrgId(coreUser.getOrgId());
             }
             List<TeacherOpenCourseScheduleSession>list = teacherOpenCourseScheduleSessionService.getValuesByQuery(condition);
             return  JsonResult.success(list);
@@ -188,7 +188,7 @@ public class TeacherOpenCourseScheduleSessionController{
     @ResponseBody
     public JsonResult<PageQuery> listGroup(TeacherOpenCourseScheduleSessionQuery condition, @SCoreUser CoreUser coreUser){
         if (!coreUser.isAdmin()) {
-            condition.setOrgId(condition.getOrgId());
+            condition.setOrgId(coreUser.getOrgId());
         }
         PageQuery page = condition.getPageQuery();
         teacherOpenCourseScheduleSessionService.queryByConditionGroup(page);
@@ -203,7 +203,7 @@ public class TeacherOpenCourseScheduleSessionController{
     @Deprecated
     public JsonResult<PageQuery> list(TeacherOpenCourseScheduleSessionQuery condition, @SCoreUser CoreUser coreUser){
         if (!coreUser.isAdmin()) {
-            condition.setOrgId(condition.getOrgId());
+            condition.setOrgId(coreUser.getOrgId());
         }
         PageQuery page = condition.getPageQuery();
         teacherOpenCourseScheduleSessionService.queryByCondition(page);
@@ -290,7 +290,7 @@ public class TeacherOpenCourseScheduleSessionController{
     @ResponseBody
     public JsonResult<List<TeacherOpenCourseScheduleSession>>getValues(TeacherOpenCourseScheduleSessionQuery condition, @SCoreUser CoreUser coreUser) {
         if (!coreUser.isAdmin()) {
-            condition.setOrgId(condition.getOrgId());
+            condition.setOrgId(coreUser.getOrgId());
         }
         List<TeacherOpenCourseScheduleSession>list = teacherOpenCourseScheduleSessionService.getValuesByQuery(condition);
         return  JsonResult.success(list);
@@ -354,7 +354,7 @@ public class TeacherOpenCourseScheduleSessionController{
         PageQuery page = condition.getPageQuery();
 
         if (!coreUser.isAdmin()) {
-            condition.setOrgId(condition.getOrgId());
+            condition.setOrgId(coreUser.getOrgId());
         }
         teacherOpenCourseScheduleSessionService.queryByConditionGroup(page);
         return JsonResult.success(page);
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 2f23b073..45442c69 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionTagController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionTagController.java
@@ -54,6 +54,9 @@ public class TeacherOpenCourseScheduleSessionTagController{
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
+            if (!coreUser.isAdmin()) {
+                condition.setOrgId(coreUser.getOrgId());
+            }
             PageQuery page = condition.getPageQuery();
             teacherOpenCourseScheduleSessionTagService.queryByConditionQuery(page);
             return JsonResult.success(page);
@@ -75,11 +78,14 @@ public class TeacherOpenCourseScheduleSessionTagController{
 
     @GetMapping(API + "/getList.do")
     @ResponseBody
-    public JsonResult<List<TeacherOpenCourseScheduleSessionTag>>getList(TeacherOpenCourseScheduleSessionTagQuery param,@SCoreUser CoreUser coreUser) {
+    public JsonResult<List<TeacherOpenCourseScheduleSessionTag>>getList(TeacherOpenCourseScheduleSessionTagQuery condition,@SCoreUser CoreUser coreUser) {
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
-            List<TeacherOpenCourseScheduleSessionTag>list = teacherOpenCourseScheduleSessionTagService.getValuesByQuery(param);
+            if (!coreUser.isAdmin()) {
+                condition.setOrgId(coreUser.getOrgId());
+            }
+            List<TeacherOpenCourseScheduleSessionTag>list = teacherOpenCourseScheduleSessionTagService.getValuesByQuery(condition);
             return  JsonResult.success(list);
         }
     }
@@ -142,7 +148,11 @@ public class TeacherOpenCourseScheduleSessionTagController{
     @PostMapping(MODEL + "/list.json")
     @Function("teacherOpenCourseScheduleSessionTag.query")
     @ResponseBody
-    public JsonResult<PageQuery> list(TeacherOpenCourseScheduleSessionTagQuery condition){
+    public JsonResult<PageQuery> list(TeacherOpenCourseScheduleSessionTagQuery condition, @SCoreUser CoreUser coreUser){
+
+        if (!coreUser.isAdmin()) {
+            condition.setOrgId(coreUser.getOrgId());
+        }
         PageQuery page = condition.getPageQuery();
         teacherOpenCourseScheduleSessionTagService.queryByCondition(page);
         return JsonResult.success(page);