ting.yin hace 6 años
padre
commit
6fdc931ccc

+ 5 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/interceptor/AdminInterceptor.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import cn.com.qmth.stmms.biz.role.service.RoleAuthService;
+import cn.com.qmth.stmms.biz.school.model.School;
 import cn.com.qmth.stmms.biz.school.service.SchoolService;
 import cn.com.qmth.stmms.biz.user.model.User;
 import cn.com.qmth.stmms.biz.user.service.UserService;
@@ -61,7 +62,10 @@ public class AdminInterceptor extends CommonInterceptor {
                     wu.setRoleMap(user.getRoleMap());
                     wu.setRoles(user.getRoles());
                     wu.setRoleDisplays(user.getRoleDisplays());
-                    wu.setSchoolName(schoolService.findById(user.getSchoolId()).getName());
+                    School school = schoolService.findById(user.getSchoolId());
+                    if(school!=null){
+                    	wu.setSchoolName(schoolService.findById(user.getSchoolId()).getName());
+                    }
                     wu.setSchools(user.getSchools());
                 }
             }