Browse Source

处理企业切换bug

liusw 8 years ago
parent
commit
02529f976c

+ 9 - 7
src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -82,23 +82,25 @@ public class AuthenticationController {
 	public void switchEnterprise(@PathVariable("enUU") long enUU) {
 		User user = SystemSession.getUser();
 		//保存登录时间
-		List<UserLoginTime> userLoginTimeList = userLoginTimeDao.findByUserUUAndEnUU(user.getUserUU(),user.getEnterprise().getUu());
+		List<UserLoginTime> userLoginTimeList = userLoginTimeDao.findByUserUUAndEnUU(user.getUserUU(), user.getEnterprise() == null ? 0L : user.getEnterprise().getUu());
 		UserLoginTime userLoginTime;
-		if (!CollectionUtils.isEmpty(userLoginTimeList)){
+		if (!CollectionUtils.isEmpty(userLoginTimeList)) {
 			userLoginTime = userLoginTimeList.get(0);
-		}else {
+		} else {
 			userLoginTime = new UserLoginTime();
 			userLoginTime.setUserUU(user.getUserUU());
-			userLoginTime.setEnUU(user.getEnterprise().getUu());
+			userLoginTime.setEnUU(user.getEnterprise() == null ? 0L : user.getEnterprise().getUu());
 		}
 		userLoginTime.setLoginTime(System.currentTimeMillis());
 		try {
 			userLoginTimeDao.save(userLoginTime);
-		}catch (Exception e){}
+		} catch (Exception e) {
 
-		if ( enUU == 0L){
+		}
+
+		if ( enUU == 0L) {
 			user.setEnterprise(null);
-		}else {
+		} else {
 			user.setCurrentEnterprise(enUU);
 		}
 	}