Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r16224 -r16487
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 16224)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 16487)
@@ -17,6 +17,12 @@
     String allSortPortalListData = portalPageAction.getCurrentUserCustomizeSortPortalPageJsons();
 	request.setAttribute("allSortPortalListData",allSortPortalListData);
 	LoginUserData userData = (LoginUserData)session.getAttribute("loginUserData");
+	// 如果为空，可能是通过收藏夹收藏的地址，经过SSO身份验证后跳转过来到本页面，session中的属性为空，故跳转到openSystemMainPage.jsp页面，重新赋值
+	if (userData == null){
+		response.sendRedirect("/openSystemMainPage.jsp");
+		return;
+	}
+	
 	String directOrgUnitCodesWhereUserBelong = userData.getDirectOrgUnitCodesWhereUserBelong();
 	boolean isUserBelongToMultipleDeparts = false; // 用户是否属于多个部门
 	if (directOrgUnitCodesWhereUserBelong != null && directOrgUnitCodesWhereUserBelong.indexOf(";") > 0){