Merge remote-tracking branch 'origin/release-201820-wangcz' into release-201820-wangcz

src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -610,12 +610,13 @@ public class UserServiceImpl implements UserService {
 
 	@Override
 	public User switchEnterprise(Long enUU) {
-		User user = SystemSession.getUser();
+		User user = userDao.findUserByUserUU(SystemSession.getUser().getUserUU()).get(0);
 		if ( enUU == 0L) {
 			user.setEnterprise(null);
 		} else {
 			user.setCurrentEnterprise(enUU);
 		}
+		SystemSession.setUser(user);
 		return user;
 	}