处理个人账户无法登录的问题

src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -366,7 +366,7 @@ public class SecurityController {
 			response.setHeader("P3P","CP=\"CURaADMa DEVa PSAo PSDo OUR BUS UNI PUR INT DEM STA PRE COM NAV OTC NOI DSPCOR\"");
 
 //			User user = getUserByToken(tk);
-			User mallUser = new User();
+			User mallUser = null;
 			if (userAccount.getMobile() != null) {
 				// UID表示所有系统公认的唯一标识，这里统一使用手机号
 				mallUser = userService.findUserByUserTelNoException(userAccount.getMobile());
@@ -375,10 +375,17 @@ public class SecurityController {
 				mallUser = userService.findUserByUserUUNoException(userAccount.getUserUU());
 			} else {
 				logger.error(String.format("invalid user %s, please set uid or dialectUID", userAccount.getVipName()));
+				return "successCallback({success:'0'})";
+			}
+
+			// 没用用户
+			if (mallUser == null) {
+				UserView userView = AccountUtils.findByUserUU(userAccount.getUserUU());
+				mallUser = userAccountService.save(userView);
 			}
 
 			// 企业判断
-			Enterprise enterprise = new Enterprise();
+			Enterprise enterprise = null;
 			if (userAccount.getSpaceUU() != null) {
 				Enterprise oldEnterprise = enterpriseDao.findByUu(userAccount.getSpaceUU());
 				// 判断商城是否存在当前企业，若存在则设置当前企业即可，若不存在则需新建一个企业后进行设置
@@ -411,17 +418,12 @@ public class SecurityController {
 				} else {
 					enterprise = oldEnterprise;
 				}
-			}
-			// 没用用户
-			if (mallUser == null) {
-				UserView userView = AccountUtils.findByUserUU(userAccount.getUserUU());
-				mallUser = userAccountService.save(userView);
-			}
-			if (enterprise != null && !mallUser.getEnterprises().contains(enterprise)) {
-//				if (!mallUser.getUserUU().equals(enterprise.getEnAdminuu())) {
+				// 用户关联企业
+				if (!mallUser.getEnterprises().contains(enterprise)) {
 					mallUser.getEnterprises().add(enterprise);
-//				}
+				}
 			}
+
 			// 最后一次登录时间
 			Date lastLoginTime = userAccount.getLastLoginTime();
 			if (lastLoginTime != null) {