diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java index fd5275ed..e941dbe0 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java @@ -119,11 +119,9 @@ public class TeacherOpenCourseChatLogController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ + Assert.notNull(coreUser, "请登录后再操作"); teacherOpenCourseChatLogQuery.setUserId(coreUser.getId()); teacherOpenCourseChatLogQuery.setOrgId(coreUser.getOrgId()); - if(null == teacherOpenCourseChatLogQuery.getTeacherOpenCourseChatLogStatus()){ - teacherOpenCourseChatLogQuery.setTeacherOpenCourseChatLogStatus(1); - } if (ObjectUtil.isNotEmpty(teacher)) { teacherOpenCourseChatLogQuery.setTeacherId(teacher.getTeacherId()); } @@ -249,15 +247,21 @@ public class TeacherOpenCourseChatLogController{ @PostMapping(MODEL + "/add.json") @Function("teacherOpenCourseChatLog.add") - public JsonResult add(@Validated(ValidateConfig.ADD.class) @RequestBody TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery, BindingResult result,@SCoreUser CoreUser coreUser){ + public JsonResult add( + @Validated(ValidateConfig.ADD.class) @RequestBody TeacherOpenCourseChatLogQuery teacherOpenCourseChatLogQuery, + BindingResult result,@SCoreUser CoreUser coreUser, @TTeacher Teacher teacher, @TStudent Student student){ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ - teacherOpenCourseChatLogQuery.setUserId(coreUser.getId()); - teacherOpenCourseChatLogQuery.setOrgId(coreUser.getOrgId()); - if(null == teacherOpenCourseChatLogQuery.getTeacherOpenCourseChatLogStatus()){ - teacherOpenCourseChatLogQuery.setTeacherOpenCourseChatLogStatus(1); - } + Assert.notNull(coreUser, "请登录后再操作"); + teacherOpenCourseChatLogQuery.setUserId(coreUser.getId()); + teacherOpenCourseChatLogQuery.setOrgId(coreUser.getOrgId()); + if (ObjectUtil.isNotEmpty(teacher)) { + teacherOpenCourseChatLogQuery.setTeacherId(teacher.getTeacherId()); + } + if (ObjectUtil.isNotEmpty(student)) { + teacherOpenCourseChatLogQuery.setStudentId(student.getStudentId()); + } return teacherOpenCourseChatLogService.add(teacherOpenCourseChatLogQuery); } }