Merge branch 'dev-mysql' into feature_release-tomysql

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

@@ -1,7 +1,10 @@
 package com.uas.platform.b2c.common.account.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.uas.account.entity.UserSpace;
+import com.uas.account.entity.UserSpaceDetail;
 import com.uas.account.entity.UserView;
+import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.dao.UserLoginTimeDao;
@@ -11,6 +14,7 @@ import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.UserLoginTime;
 import com.uas.platform.b2c.common.account.service.SigninLogService;
 import com.uas.platform.b2c.common.account.service.UserService;
+import com.uas.platform.b2c.common.account.v2.service.EnterpriseService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -54,6 +58,9 @@ public class SecurityController {
 	@Autowired
 	private UserLoginTimeDao userLoginTimeDao;
 
+	@Autowired
+	private EnterpriseService enterpriseService;
+
 	@Autowired
 	private EnterpriseDao enterpriseDao;
 
@@ -301,9 +308,23 @@ public class SecurityController {
 					}
 					if (null == authedUser.getEnterprise()) {
 						Enterprise newEnterprise = enterpriseDao.findByUu(Long.parseLong(tokenUser.getSpaceDialectUID()));
-						authedUser.getEnterprises().add(newEnterprise);
-						userDao.save(authedUser);
-						authedUser.setEnterprise(newEnterprise);
+						if (null == newEnterprise) {
+							UserSpaceDetail userSpaceDetail = null;
+							try {
+								userSpaceDetail = AccountUtils.findByBusinessCode(tokenUser.getSpaceUID());
+							} catch (Exception e) { }
+							UserSpace userSpace = new UserSpace();
+							userSpace.setDialectUID(tokenUser.getSpaceDialectUID());
+							if (null != userSpaceDetail) {
+								enterpriseService.update(userSpace,userSpaceDetail);
+							}
+							newEnterprise = enterpriseDao.findByUu(Long.parseLong(tokenUser.getSpaceDialectUID()));
+							authedUser.setEnterprise(newEnterprise);
+						} else {
+							authedUser.getEnterprises().add(newEnterprise);
+							userDao.save(authedUser);
+							authedUser.setEnterprise(newEnterprise);
+						}
 					}
 				} else if (tokenUser.getSpaceUID() != null) {
 					for (Enterprise enterprise : authedUser.getEnterprises()) {

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_index_ctrl.js

@@ -28,7 +28,7 @@ define(['app/app', 'calendar'], function(app) {
                     jsonpCallback:"successCallback",
                     success:function(data){
                         console.log(data);
-                        window.location.href = urlPrex + '/sso/center?type=apply';
+                        window.open = urlPrex + '/sso/center?type=apply';
                     },
                     error:function(data) {
                         console.log(data);