Index: ssts-web/src/main/webapp/openSystemMainPage.jsp
===================================================================
diff -u -r14951 -r15011
--- ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 14951)
+++ ssts-web/src/main/webapp/openSystemMainPage.jsp	(.../openSystemMainPage.jsp)	(revision 15011)
@@ -6,16 +6,19 @@
 <%@page import="java.util.List"%>
 <%
 LoginUserData loginUserData = AcegiHelper.getLoginUser();
+session.setAttribute("openSelectOrgUnitWindow", "打开");  //决定要不要打切换科室的窗口
 if(loginUserData.getDirectOrgUnitCodesWhereUserBelong().indexOf(";") > 0){
-	loginUserData = ((UserIPAndOrgUnitMappingManager)SpringBeanManger.getBean("userIPAndOrgUnitMappingManager")).setUserIPAndOrgUnitMapping(loginUserData);  //查看此用户是否跟科室绑定过IP地址
+	boolean flag = ((UserIPAndOrgUnitMappingManager)SpringBeanManger.getBean("userIPAndOrgUnitMappingManager")).setUserIPAndOrgUnitMapping(loginUserData);  //查看此用户是否跟科室绑定过IP地址
+	if (flag) {
+		session.setAttribute("openSelectOrgUnitWindow", "不打开");
+	}
 }
 session.setAttribute("loginUserData",loginUserData);
 session.setAttribute("userName",loginUserData.getUserFullName());
 session.setAttribute("userId",loginUserData.getUserName());
 SystemconfigureBean systemConfigureBean = ((SystemconfigureManager)SpringBeanManger.getBean("systemconfigureManager")).getSystemconfigure();
 session.setAttribute("softName",systemConfigureBean.getCompanyShotName() + " ");
 session.setAttribute("title",systemConfigureBean.getCompanyShotName() + " 消毒供应质量追溯管理系统 用户:"+loginUserData.getUserFullName());
-session.setAttribute("openSelectOrgUnitWindow", "打开");  //决定要不要打切换科室的窗口
 
 String ctx = request.getContextPath();
 session.setAttribute("userOperationIds", loginUserData.getUserOperationIds());
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service/UserIPAndOrgUnitMappingManager.java
===================================================================
diff -u -r14952 -r15011
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service/UserIPAndOrgUnitMappingManager.java	(.../UserIPAndOrgUnitMappingManager.java)	(revision 14952)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service/UserIPAndOrgUnitMappingManager.java	(.../UserIPAndOrgUnitMappingManager.java)	(revision 15011)
@@ -35,6 +35,6 @@
 	 * @param userIP：用户的IP地址
 	 * @return
 	 */
-	public LoginUserData setUserIPAndOrgUnitMapping(LoginUserData loginUserData);
+	public boolean setUserIPAndOrgUnitMapping(LoginUserData loginUserData);
 	
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service/UserIPAndOrgUnitMappingManagerImpl.java
===================================================================
diff -u -r14952 -r15011
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service/UserIPAndOrgUnitMappingManagerImpl.java	(.../UserIPAndOrgUnitMappingManagerImpl.java)	(revision 14952)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/useripandorgunitmapping/service/UserIPAndOrgUnitMappingManagerImpl.java	(.../UserIPAndOrgUnitMappingManagerImpl.java)	(revision 15011)
@@ -45,20 +45,20 @@
 
 
 	@Override
-	public LoginUserData setUserIPAndOrgUnitMapping(LoginUserData loginUserData) {
+	public boolean setUserIPAndOrgUnitMapping(LoginUserData loginUserData) {
 
+		boolean flag = false;
 		String userName = loginUserData.getUserName();
 		String userIP = loginUserData.getUserIP();
 		if(userIP.lastIndexOf(".") < 0){
-			return loginUserData;
+			return flag;
 		}
 		String userIPTheFirstThree = userIP.substring(0, userIP.lastIndexOf("."));
 		int userIPLast = Integer.parseInt(userIP.substring(userIP.lastIndexOf(".") + 1));
 		
 		
 		List<UserIPAndOrgUnitMapping> userIPAndOrgUnitMappingList = objectDao.findByProperty(UserIPAndOrgUnitMapping.class.getSimpleName(), "userName", userName);
 		
-		boolean flag = false;
 		for (UserIPAndOrgUnitMapping userIPAndOrgUnitMapping : userIPAndOrgUnitMappingList) {
 			String[] ipArray =  userIPAndOrgUnitMapping.getIpAddress().split(",");
 			for (String ip : ipArray) {
@@ -77,14 +77,12 @@
 				if (flag) {
 					loginUserData.setCurrentOrgUnitCode(userIPAndOrgUnitMapping.getDefaultOrgUnitCode());
 					loginUserData.setCurrentOrgUnitName(userIPAndOrgUnitMapping.getDefaultOrgUnitName());
-					return loginUserData;
+					return flag;
 				}
 			}
 		}
+		return flag;
 		
-		return loginUserData;
-		
-		
 	}
 	
 }