diff --git a/web/src/main/java/cn/jlw/Interceptor/GetTStudent.java b/web/src/main/java/cn/jlw/Interceptor/GetTStudent.java index 6d8d3a23..b4bb3d53 100644 --- a/web/src/main/java/cn/jlw/Interceptor/GetTStudent.java +++ b/web/src/main/java/cn/jlw/Interceptor/GetTStudent.java @@ -1,5 +1,6 @@ package cn.jlw.Interceptor; +import cn.hutool.core.util.ObjectUtil; import com.ibeetl.jlw.entity.Student; import org.springframework.context.annotation.Configuration; import org.springframework.core.MethodParameter; @@ -35,7 +36,7 @@ public class GetTStudent implements HandlerMethodArgumentResolver { HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); - Student student = null == request.getSession().getAttribute(T_STUDENT) ? null : (Student) request.getSession().getAttribute(T_STUDENT); + Student student = (Student) ObjectUtil.defaultIfNull(request.getAttribute(T_STUDENT), request.getSession().getAttribute(T_STUDENT)); return student; diff --git a/web/src/main/java/cn/jlw/Interceptor/GetTTeacher.java b/web/src/main/java/cn/jlw/Interceptor/GetTTeacher.java index e0a52caf..28586a95 100644 --- a/web/src/main/java/cn/jlw/Interceptor/GetTTeacher.java +++ b/web/src/main/java/cn/jlw/Interceptor/GetTTeacher.java @@ -1,5 +1,6 @@ package cn.jlw.Interceptor; +import cn.hutool.core.util.ObjectUtil; import com.ibeetl.jlw.entity.Teacher; import org.springframework.context.annotation.Configuration; import org.springframework.core.MethodParameter; @@ -34,9 +35,7 @@ public class GetTTeacher implements HandlerMethodArgumentResolver { TTeacher tTeacher = parameter.getParameterAnnotation(TTeacher.class); HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); - - Teacher teacher = null == request.getSession().getAttribute(T_TEACHER) ? null : (Teacher) request.getSession().getAttribute(T_TEACHER); - + Teacher teacher = (Teacher) ObjectUtil.defaultIfNull(request.getAttribute(T_TEACHER), request.getSession().getAttribute(T_TEACHER)); return teacher; }