|
@@ -156,29 +156,25 @@ public class ApiInterceptor extends HandlerInterceptorAdapter {
|
|
|
}
|
|
|
|
|
|
private boolean buildApiUser(HttpServletRequest request, HttpServletResponse response, User user) {
|
|
|
- ApiUser wu = new ApiUser(user);
|
|
|
- if (wu != null) {
|
|
|
- if(wu.getRole() == Role.SYS_ADMIN){
|
|
|
- return true;
|
|
|
- }
|
|
|
- Integer examId = SessionExamUtils.getExamId(request);
|
|
|
- String uri = request.getRequestURI();
|
|
|
- if((examId== null || examId<=0) && !uri.startsWith("/api/admin/exam/list") ){
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (wu.getRole() == Role.SUBJECT_HEADER || wu.getRole() == Role.INSPECTOR
|
|
|
- || wu.getRole() == Role.COLLEGE_ADMIN || wu.getRole() == Role.SCHOOL_VIEWER) {
|
|
|
- wu.setSubjectCodeSet(subjectUserService.findSubjectCode(wu.getId()));
|
|
|
- }
|
|
|
- RequestUtils.setRolePrivilegeCodes(request,
|
|
|
- rolePrivilegeService.getRoleCodes(wu.getUser().getSchoolId(), wu.getRole()));
|
|
|
- RequestUtils.setPrivileges(request, privilegeService.getMenuPrivileges());
|
|
|
- RequestUtils.setApiUser(request, wu);
|
|
|
- sessionService.put(request, response, RequestUtils.getSession(request));
|
|
|
- return true;
|
|
|
- }else{
|
|
|
+ if (user == null) {
|
|
|
return false;
|
|
|
}
|
|
|
+ Integer examId = SessionExamUtils.getExamId(request);
|
|
|
+ String uri = request.getRequestURI();
|
|
|
+ if ((examId == null || examId <= 0) && !uri.startsWith("/api/admin/exam/list")) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ ApiUser wu = new ApiUser(user);
|
|
|
+ if (wu.getRole() == Role.SUBJECT_HEADER || wu.getRole() == Role.INSPECTOR || wu.getRole() == Role.COLLEGE_ADMIN
|
|
|
+ || wu.getRole() == Role.SCHOOL_VIEWER) {
|
|
|
+ wu.setSubjectCodeSet(subjectUserService.findSubjectCode(wu.getId()));
|
|
|
+ }
|
|
|
+ RequestUtils.setRolePrivilegeCodes(request,
|
|
|
+ rolePrivilegeService.getRoleCodes(wu.getUser().getSchoolId(), wu.getRole()));
|
|
|
+ RequestUtils.setPrivileges(request, privilegeService.getMenuPrivileges());
|
|
|
+ RequestUtils.setApiUser(request, wu);
|
|
|
+ sessionService.put(request, response, RequestUtils.getSession(request));
|
|
|
+ return true;
|
|
|
}
|
|
|
|
|
|
@Override
|