From c6411d05849df74beade8c5889c0e8ae795b224f Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Wed, 8 Feb 2023 02:05:47 +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 --- .../jlw/web/TeacherOpenCourseController.java | 17 ++++++++++++++--- ...penCourseScheduleSessionClassController.java | 5 ++++- ...cherOpenCourseScheduleSessionController.java | 6 +++++- 3 files changed, 23 insertions(+), 5 deletions(-) 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 77c21fb3..7d746dc5 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java @@ -56,6 +56,10 @@ public class TeacherOpenCourseController{ if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ + + if (coreUser.isUniAdmin()) { + condition.setOrgId(condition.getOrgId()); + } PageQuery page = condition.getPageQuery(); teacherOpenCourseService.queryByConditionQuery(page); return JsonResult.success(page); @@ -77,11 +81,14 @@ public class TeacherOpenCourseController{ @GetMapping(API + "/getList.do") @ResponseBody - public JsonResult>getList(TeacherOpenCourseQuery param,@SCoreUser CoreUser coreUser) { + public JsonResult>getList(TeacherOpenCourseQuery condition,@SCoreUser CoreUser coreUser) { if(null == coreUser){ return JsonResult.failMessage("请登录后再操作"); }else{ - Listlist = teacherOpenCourseService.getValuesByQuery(param); + if (coreUser.isUniAdmin()) { + condition.setOrgId(condition.getOrgId()); + } + Listlist = teacherOpenCourseService.getValuesByQuery(condition); return JsonResult.success(list); } } @@ -159,8 +166,12 @@ public class TeacherOpenCourseController{ @PostMapping(MODEL + "/list.json") @Function("teacherOpenCourse.query") @ResponseBody - public JsonResult list(TeacherOpenCourseQuery condition){ + public JsonResult list(TeacherOpenCourseQuery condition, @SCoreUser CoreUser coreUser){ PageQuery page = condition.getPageQuery(); + + if (coreUser.isUniAdmin()) { + condition.setOrgId(condition.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 65fcceae..cee16642 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionClassController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionClassController.java @@ -120,8 +120,11 @@ public class TeacherOpenCourseScheduleSessionClassController{ @PostMapping(MODEL + "/list.json") @Function("teacherOpenCourseScheduleSessionClass.query") @ResponseBody - public JsonResult list(TeacherOpenCourseScheduleSessionClassQuery condition){ + public JsonResult list(TeacherOpenCourseScheduleSessionClassQuery condition, @SCoreUser CoreUser coreUser){ PageQuery page = condition.getPageQuery(); + if (coreUser.isUniAdmin()) { + condition.setOrgId(condition.getOrgId()); + } teacherOpenCourseScheduleSessionClassService.queryByCondition(page); return JsonResult.success(page); } 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 83334fb8..b9480ca6 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java @@ -335,8 +335,12 @@ public class TeacherOpenCourseScheduleSessionController{ */ @PostMapping(MODEL + "/listGroup.json") @ResponseBody - public JsonResult listGroupJson(TeacherOpenCourseScheduleSessionQuery condition){ + public JsonResult listGroupJson(TeacherOpenCourseScheduleSessionQuery condition, @SCoreUser CoreUser coreUser){ PageQuery page = condition.getPageQuery(); + + if (coreUser.isUniAdmin()) { + condition.setOrgId(condition.getOrgId()); + } teacherOpenCourseScheduleSessionService.queryByConditionGroup(page); return JsonResult.success(page); }