用户信息

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -380,18 +380,24 @@ public class UserInfoController {
 		try {
 			// JSON字符串转对象
 			ObjectMapper mapper = new ObjectMapper();
-			String userInfoObject = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
-			if(!userInfoObject.isEmpty()) {
-				UserInfo userInfo = mapper.readValue(userInfoObject, UserInfo.class);
-				//UserInfo userInfo = (UserInfo)request.getSession().getAttribute("userInfo");
-				modelMap.put("userInfo", userInfo);
-			}
+			
+			String orgName = "";
 			String orgInfoObject = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
 			if(!orgInfoObject.isEmpty()) {
 				OrgInfo orgInfo = mapper.readValue(orgInfoObject, OrgInfo.class);
 				//OrgInfo orgInfo = (OrgInfo)request.getSession().getAttribute("orgInfo");
+				orgName = orgInfo.getOrgName();
 				modelMap.put("orgInfo", orgInfo);
 			}
+			
+			String userInfoObject = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
+			if(!userInfoObject.isEmpty()) {
+				UserInfo userInfo = mapper.readValue(userInfoObject, UserInfo.class);
+				//UserInfo userInfo = (UserInfo)request.getSession().getAttribute("userInfo");
+				userInfo.setOrgName(orgName);
+				modelMap.put("userInfo", userInfo);
+			}
+			
 			String depotInfoObject = ObjectUtils.toString(request.getSession().getAttribute("depotInfo"),"");
 			if(!depotInfoObject.isEmpty()) {
 				OrgInfo depotInfo = mapper.readValue(depotInfoObject, OrgInfo.class);