1

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java

@@ -52,7 +52,7 @@ public class TeacherOpenCourseController{
 
     @PostMapping(API + "/getPageList.do")
     @ResponseBody
-    public JsonResult<PageQuery> getPageList(TeacherOpenCourseQuery condition,@SCoreUser CoreUser coreUser){
+    public JsonResult<PageQuery> getPageList(TeacherOpenCourseQuery condition, @SCoreUser CoreUser coreUser){
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeScheduleSessionController.java

@@ -61,10 +61,14 @@ public class TeacherOpenCourseMergeScheduleSessionController{
     /* 前端接口 */
 
     @PostMapping(API + "/getPageList.do")
-    public JsonResult<PageQuery> getPageList(TeacherOpenCourseMergeScheduleSessionQuery condition,@SCoreUser CoreUser coreUser){
+    public JsonResult<PageQuery> getPageList(TeacherOpenCourseMergeScheduleSessionQuery condition, @SCoreUser CoreUser coreUser){
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
+
+            if (!coreUser.isAdmin()) {
+                condition.setOrgId(coreUser.getOrgId());
+            }
             PageQuery page = condition.getPageQuery();
             teacherOpenCourseMergeScheduleSessionService.queryByConditionQuery(page);
             return JsonResult.success(page);
@@ -84,11 +88,14 @@ public class TeacherOpenCourseMergeScheduleSessionController{
 
 
     @GetMapping(API + "/getList.do")
-    public JsonResult<List<TeacherOpenCourseMergeScheduleSession>>getList(TeacherOpenCourseMergeScheduleSessionQuery param,@SCoreUser CoreUser coreUser) {
+    public JsonResult<List<TeacherOpenCourseMergeScheduleSession>>getList(TeacherOpenCourseMergeScheduleSessionQuery condition, @SCoreUser CoreUser coreUser) {
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
-            List<TeacherOpenCourseMergeScheduleSession>list = teacherOpenCourseMergeScheduleSessionService.getValuesByQuery(param);
+            if (!coreUser.isAdmin()) {
+                condition.setOrgId(coreUser.getOrgId());
+            }
+            List<TeacherOpenCourseMergeScheduleSession>list = teacherOpenCourseMergeScheduleSessionService.getValuesByQuery(condition);
             return  JsonResult.success(list);
         }
     }
@@ -99,7 +106,6 @@ public class TeacherOpenCourseMergeScheduleSessionController{
             return JsonResult.failMessage(result);
         }else{
             teacherOpenCourseMergeScheduleSessionQuery.setTeacherOpenCourseMergeScheduleSessionAddTime(new Date());
-            teacherOpenCourseMergeScheduleSessionQuery.setUserId(coreUser.getId());
             teacherOpenCourseMergeScheduleSessionQuery.setOrgId(coreUser.getOrgId());
             return teacherOpenCourseMergeScheduleSessionService.add(teacherOpenCourseMergeScheduleSessionQuery);
         }
@@ -155,8 +161,12 @@ public class TeacherOpenCourseMergeScheduleSessionController{
 
     @PostMapping(MODEL + "/list.json")
     @Function("teacherOpenCourseMergeScheduleSession.query")
-    public JsonResult<PageQuery> list(TeacherOpenCourseMergeScheduleSessionQuery condition){
+    public JsonResult<PageQuery> list(TeacherOpenCourseMergeScheduleSessionQuery condition, @SCoreUser CoreUser coreUser){
         PageQuery page = condition.getPageQuery();
+
+        if (!coreUser.isAdmin()) {
+            condition.setOrgId(coreUser.getOrgId());
+        }
         teacherOpenCourseMergeScheduleSessionService.queryByCondition(page);
         return JsonResult.success(page);
     }

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java

@@ -114,8 +114,8 @@ public class TeacherOpenCourseScheduleSessionController{
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
-            List<Map> list = (List<Map>) teacherOpenCourseScheduleSessionService
-                    .getSessionNameList2(teacherOpenCourseId, ObjectUtil.defaultIfNull(teacher, new Teacher()).getTeacherId());
+            List<Map> list = teacherOpenCourseScheduleSessionService
+                    .getSessionNameList(teacherOpenCourseId, ObjectUtil.defaultIfNull(teacher, new Teacher()).getTeacherId());
             return  JsonResult.success(list);
         }
     }