Index: ssts-web/src/main/webapp/openSystemMainPage.jsp
===================================================================
diff -u -r23160 -r24376
--- ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 23160)
+++ ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 24376)
@@ -71,8 +71,16 @@
 	} else {
 		response.sendRedirect(ctx + "/logon.jsp?login_error=3");
 	}
-} else {
-	response.sendRedirect(ctx + "/homepage/portalPage.jsp");//桌面版
+} else {//桌面版
+	//如果主页版本为1,则跳转至bootstrap主页
+	int mainPageVersion = CssdUtils.getSystemSetConfigByNameInt("mainPageVersion", 0);
+	if(mainPageVersion == 1){
+		response.sendRedirect(ctx + "/dx-disinfectsystem/pages/index.jsp");//bootstrap主页
+	}else if(mainPageVersion == 2){
+		//
+	}else{
+		response.sendRedirect(ctx + "/homepage/portalPage.jsp");//ext主页
+	}
 }
 
 String reqUrl = request.getHeader("Referer");