Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r23679 -r25263
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 23679)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 25263)
@@ -11,61 +11,70 @@
 <%@page import="java.io.File" %>
 <%@page import="com.forgon.disinfectsystem.entity.satisfactionsurvey.Satisfaction"%>
 
-<%long l = System.currentTimeMillis();
-	PortalPageAction portalPageAction = (PortalPageAction)SpringBeanManger.getBean("portalPageAction");
-    SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
-    
-    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){
-		isUserBelongToMultipleDeparts = true;
-	}
-	String currentOrgUnitName = userData.getCurrentOrgUnitName();
-	String orgCoding = userData.getOrgUnitCodingFromSupplyRoomConfig();
-	SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig();//getSupplyRoomTypeByOrgUnitCoding(orgCoding);
-	if(supplyRoomConfig != null && supplyRoomConfig.getOrgUnitCoding()!=null && supplyRoomConfig.getOrgUnitCoding().equals(orgCoding)){//如果不是一级供应室的人，不会出现数字提醒，只显示图标
-		request.setAttribute("isShowTipNumber", true);
-	}else{
-		request.setAttribute("isShowTipNumber", false);
-	}
-    if(currentOrgUnitName!=null){
-	    request.setAttribute("depart",currentOrgUnitName);
-    }
-    request.setAttribute("fontSize",userData.getFontSize() == null?"12":userData.getFontSize());
-    request.setAttribute("departCoding",orgCoding);
-    String loginUserDataJsonStr = JSONObject.fromObject(userData).toString();
-    request.setAttribute("loginUserDataJsonStr",loginUserDataJsonStr);
-    
-    String companyName = CssdUtils.getSystemSetConfigByName("companyName");
-    String project = CssdUtils.getConfigProperty("project");
-    String imgPath =  "disinfectsystem/config/" + project + "/img/logo_" + project +".png";
-    File file = new File(application.getRealPath("/") + imgPath);
-    if(file.exists()){
-    	request.setAttribute("logoPath",imgPath);
-    }else{
-    	if(companyName == null || companyName.equals("forgon")){
-    		request.setAttribute("logoPath","themes/portalPage/img/logo_Forgon.png");
-    	}else if(companyName.equals("dingxiang")){
-    		request.setAttribute("logoPath","themes/portalPage/img/logo_dingxiangsoft.png");
-    	}
-    }
-    String openSelectOrgUnitWindow = (String)session.getAttribute("openSelectOrgUnitWindow");  //决定要不要显示切换科室的窗口
-    if ("打开".equals(openSelectOrgUnitWindow)) {
-    	session.setAttribute("openSelectOrgUnitWindow", "不打开");  //这一步防止刷新又会打开
-    }
-    String v_ENABLE_SPEECH_RECOGNITION = (String)session.getAttribute(WebConstants.KEY_ENABLE_SPEECH_RECOGNITION);
-    boolean ENABLE_SPEECH_RECOGNITION = WebConstants.VALUE_ENABLE.equals(v_ENABLE_SPEECH_RECOGNITION);
-    
-    request.setAttribute("ENABLE_SPEECH_RECOGNITION",ENABLE_SPEECH_RECOGNITION);
+<%
+		PortalPageAction portalPageAction = (PortalPageAction)SpringBeanManger.getBean("portalPageAction");
+	    SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+	    
+	    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){
+			isUserBelongToMultipleDeparts = true;
+		}
+		String currentOrgUnitName = userData.getCurrentOrgUnitName();
+		String orgCoding = userData.getOrgUnitCodingFromSupplyRoomConfig();
+		SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig();//getSupplyRoomTypeByOrgUnitCoding(orgCoding);
+		if(supplyRoomConfig != null && supplyRoomConfig.getOrgUnitCoding()!=null && supplyRoomConfig.getOrgUnitCoding().equals(orgCoding)){//如果不是一级供应室的人，不会出现数字提醒，只显示图标
+			request.setAttribute("isShowTipNumber", true);
+		}else{
+			request.setAttribute("isShowTipNumber", false);
+		}
+	    if(currentOrgUnitName!=null){
+		    request.setAttribute("depart",currentOrgUnitName);
+	    }
+	    request.setAttribute("fontSize",userData.getFontSize() == null?"12":userData.getFontSize());
+	    request.setAttribute("departCoding",orgCoding);
+	    String loginUserDataJsonStr = JSONObject.fromObject(userData).toString();
+	    request.setAttribute("loginUserDataJsonStr",loginUserDataJsonStr);
+	    
+	    String companyName = CssdUtils.getSystemSetConfigByName("companyName");
+	    String project = CssdUtils.getConfigProperty("project");
+	    String imgPath =  "disinfectsystem/config/" + project + "/img/logo_" + project +".png";
+	    File file = new File(application.getRealPath("/") + imgPath);
+	    if(file.exists()){
+	    	request.setAttribute("logoPath",imgPath);
+	    }else{
+	    	if(companyName == null || companyName.equals("forgon")){
+	    		request.setAttribute("logoPath","themes/portalPage/img/logo_Forgon.png");
+	    	}else if(companyName.equals("dingxiang")){
+	    		request.setAttribute("logoPath","themes/portalPage/img/logo_dingxiangsoft.png");
+	    	}
+	    }
+	    String menuPath = "disinfectsystem/config/" + project + "/menu/menuconfigure.js";
+	    File fileMenu = new File(application.getRealPath("/") + menuPath);
+	    
+	    if(fileMenu.exists()){
+	    	session.setAttribute("menuPath", "/"+menuPath);
+	    }else{
+	    	session.setAttribute("menuPath", "/homepage/menuconfigure.js");
+	    }
+	    
+	    String openSelectOrgUnitWindow = (String)session.getAttribute("openSelectOrgUnitWindow");  //决定要不要显示切换科室的窗口
+	    if ("打开".equals(openSelectOrgUnitWindow)) {
+	    	session.setAttribute("openSelectOrgUnitWindow", "不打开");  //这一步防止刷新又会打开
+	    }
+	    String v_ENABLE_SPEECH_RECOGNITION = (String)session.getAttribute(WebConstants.KEY_ENABLE_SPEECH_RECOGNITION);
+	    boolean ENABLE_SPEECH_RECOGNITION = WebConstants.VALUE_ENABLE.equals(v_ENABLE_SPEECH_RECOGNITION);
+	    
+	    request.setAttribute("ENABLE_SPEECH_RECOGNITION",ENABLE_SPEECH_RECOGNITION);
 %>
 <html>
 <head>