修复用户无法分配权限的bug

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@3242 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -163,12 +163,12 @@ public class UserServiceImpl implements UserService {
 			}
 			try {
 				if(isNotSaas(SystemSession.getUser().getEnterprise().getUu())) {
-					if(user.getEnterprise() != null) {
-						user = userDao.save(user);
+					if(newUser.getEnterprise() != null) {
+						newUser = userDao.save(newUser);
 					}
 				} else {
-					if (user.getEnterprise() == null || sendUserToManage(user)) {
-						user = userDao.save(user);
+					if (newUser.getEnterprise() == null || sendUserToManage(newUser)) {
+						newUser = userDao.save(newUser);
 					}
 				}
 			} catch (Exception e) {
@@ -637,7 +637,7 @@ public class UserServiceImpl implements UserService {
 	public boolean isNotSaas(Long uu) {
 		//判断当前企业是否为saas企业
 		Enterprise myenter = enterpriseDao.findEnterpriseByUu(uu);
-		if(myenter.getEnSaasStatus() == 313) {
+		if (myenter.getEnSaasStatus() != null && myenter.getEnSaasStatus() == 313) {
 			return true;
 		}
 		return false;