Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r14691 -r15337
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 14691)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 15337)
@@ -4,6 +4,7 @@
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
 <%@page import="com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO,net.sf.json.JSONObject"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@page import="com.forgon.disinfectsystem.common.*"%>
 <%@ page import="com.forgon.tools.SpringBeanManger,com.forgon.directory.vo.LoginUserData,com.forgon.portal.action.PortalPageAction"%>
 <%@ page import="java.util.Date"%>
 <%@ include file="/common/taglibs.jsp"%>
@@ -37,13 +38,18 @@
     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{
-    	request.setAttribute("logoPath","themes/portalPage/img/logo_Forgon.png");
+    	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)) {