From c1fcc02713ae43e3efd67d33cdcabcfea7c5a9da Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 8 Feb 2023 02:48:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseScheduleSessionController.java   | 11 ++++++++++-
 .../jlw/teacherOpenCourseScheduleSession/add.html     |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

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 ab7d6749..6d682cc2 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java
@@ -145,20 +145,29 @@ public class TeacherOpenCourseScheduleSessionController{
     @GetMapping(MODEL + "/add.do")
     @Function("teacherOpenCourseScheduleSession.add")
     @ResponseBody
-    public ModelAndView add(Long teacherOpenCourseScheduleSessionId) {
+    public ModelAndView add(Long teacherOpenCourseScheduleSessionId, @SCoreUser CoreUser coreUser) {
         ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseScheduleSession/add.html");
 
         // 教师开课列表
         TeacherOpenCourseQuery tocParams = new TeacherOpenCourseQuery();
         tocParams.setTeacherOpenCourseStatus(1);
+        if (!coreUser.isAdmin()) {
+            tocParams.setOrgId(coreUser.getOrgId());
+        }
         view.addObject("teacherOpenCourseList", teacherOpenCourseService.getValuesByQuery(tocParams));
         // 公共查询
         // 课次标签列表
         TeacherOpenCourseScheduleSessionTagQuery param = new TeacherOpenCourseScheduleSessionTagQuery();
+        if (!coreUser.isAdmin()) {
+            param.setOrgId(coreUser.getOrgId());
+        }
         view.addObject("sessionTagList", teacherOpenCourseScheduleSessionTagService.getValuesByQuery(param));
 
         // 教室列表
         TeacherOpenCourseScheduleSessionClassQuery classQuery = new TeacherOpenCourseScheduleSessionClassQuery();
+        if (!coreUser.isAdmin()) {
+            classQuery.setOrgId(coreUser.getOrgId());
+        }
         List<TeacherOpenCourseScheduleSessionClass> valuesByQuery = teacherOpenCourseScheduleSessionClassService.getValuesByQuery(classQuery);
         valuesByQuery.forEach(item -> {
             // 教室 全路径的名称
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index c4e3dac5..ca53dcf5 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -34,7 +34,7 @@
 				<label class="layui-form-label">开课课程</label>
 				<div class="layui-input-inline">
 					<layui:simpleDictSelect style='layui-input-inline'
-						type="teacher_open_course.teacher_open_course_title.1=1"
+						type="teacher_open_course.teacher_open_course_title.${user.get().isAdmin ? '1=1' : 'find_in_set(org_id, ' + user.get().orgId + ')'}"
 						id="teacherOpenCourseId" name="teacherOpenCourseId"
 						value="${teacherOpenCourseScheduleSession.teacherOpenCourseId}"/>
 				</div>
@@ -46,7 +46,7 @@
 			<div class="layui-inline">
 				<label class="layui-form-label">上课教师</label>
 				<div class="layui-input-inline">
-					<layui:simpleDictSelect style='layui-input-inline' type="teacher.teacher_name.teacher_status=1"
+					<layui:simpleDictSelect style='layui-input-inline' type="teacher.teacher_name.teacher_status=1.${user.get().isAdmin ? '1=1' : 'find_in_set(org_id, ' + user.get().orgId + ')'}"
 						id="teacherId" name="teacherId"
 						value="${teacherOpenCourseScheduleSession.teacherId}" layVerify=""/>
 				</div>