SystemSession数据结构更新，企业数据在需要的时候进行调用

src/main/java/com/uas/platform/home/controller/AccountController.java

@@ -1,5 +1,7 @@
 package com.uas.platform.home.controller;
 
+import com.uas.account.entity.UuzcUserSpaceDetail;
+import com.uas.account.util.AccountUtils;
 import com.uas.platform.home.core.support.SystemSession;
 import com.uas.platform.home.web.BaseController;
 import com.uas.sso.SSOHelper;
@@ -21,8 +23,17 @@ public class AccountController extends BaseController {
 	 */
 	@RequestMapping(value = "/account", method = RequestMethod.GET)
 	@ResponseBody
-	public ModelMap getAccountInfo() {
-		return success(SystemSession.getUser());
+	public ModelMap getAccountInfo() throws Exception {
+	    if(null != SystemSession.getUser()) {
+            ModelMap map = new ModelMap();
+	        UuzcUserSpaceDetail detail = AccountUtils.getUuzcUserSpaceDetail(SystemSession.getUser().getSpaceUID());
+            map.put("content", SystemSession.getUser());
+            if(null != detail) {
+                map.put("space", detail);
+            }
+            return map;
+        }
+	    return success();
 	}
 
 	/**

src/main/java/com/uas/platform/home/controller/UuzcController.java

@@ -20,7 +20,7 @@ import java.util.List;
 
 /**
  * 关于优软众创的一些接口
- *
+ * <p>
  * Created by hejq on 2017-11-02.
  */
 @RestController
@@ -36,27 +36,28 @@ public class UuzcController extends BaseController {
     public ModelMap checkAccount() throws Exception {
         UserView user = SystemSession.getUser();
         ModelMap map = new ModelMap();
-        if(null != user) {
-            if ( null != user.getHr() && 1 == user.getHr()) {// hr账户
-                UuzcUserInfo info = getUserInfo(user, true);
+        UuzcUserSpaceDetail detail = AccountUtils.getUuzcUserSpaceDetail(user.getSpaceUID());
+        if (null != user) {
+            if (null != user.getHr() && 1 == user.getHr()) {// hr账户
+                UuzcUserInfo info = getUserInfo(user, detail, true);
                 map.put("ishr", true);
                 map.put("user", info);
                 map.put("usertype", "hr");
-            } else if(null != user.getUuzcUserSpaceDetail()) {// 先通过登录的信息判断是否是企业用户
+            } else if (null != detail) {// 先通过登录的信息判断是否是企业用户
                 map.put("usertype", "company");
-                UuzcUserInfo info = getUserInfo(user, true);
+                UuzcUserInfo info = getUserInfo(user, detail, true);
                 //判断是否设置了hr
                 String result = AccountUtils.getHrAccount(info.getLicense());
                 ResultInfo resInfo = JSONObject.parseObject(result, ResultInfo.class);
                 map.put("hr", resInfo.getExistHr() ? true : false);
-                if(user.getUid().equals(user.getUuzcUserSpaceDetail().getAdminTel())) {
+                if (user.getUid().equals(detail.getAdminTel())) {
                     map.put("manager", true);
                 } else {
-                    map.put("managerName", user.getUuzcUserSpaceDetail().getAdminName());
+                    map.put("managerName", detail.getAdminName());
                 }
                 map.put("user", info);
-            } else if(null == user.getUuzcUserSpaceDetail()) {// 个人用户
-                UuzcUserInfo info = getUserInfo(user, false);
+            } else if (null == detail) {// 个人用户
+                UuzcUserInfo info = getUserInfo(user, detail, false);
                 JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
                 map.put("user", formData);
                 map.put("usertype", "personal");
@@ -75,7 +76,7 @@ public class UuzcController extends BaseController {
      * @param company
      * @return
      */
-    private UuzcUserInfo getUserInfo(UserView user, boolean company) {
+    private UuzcUserInfo getUserInfo(UserView user, UuzcUserSpaceDetail detail, boolean company) {
         UuzcUserInfo info = new UuzcUserInfo();
         info.setEmail(user.getSecondUID());
         info.setMobile(user.getUid());
@@ -83,18 +84,18 @@ public class UuzcController extends BaseController {
         info.setPassword(user.getPassword());
         info.setSalt(user.getSalt());
         info.setUsername(user.getName());
-        if(null != user.getUuzcUserSpaceDetail() && company) {
+        if (null != detail && company) {
             info.setCompanyname(user.getSpaceName());
             info.setLicense(user.getSpaceUID());
-            info.setContact(user.getUuzcUserSpaceDetail().getContactMan() != null ?
-                    user.getUuzcUserSpaceDetail().getContactMan() : user.getUuzcUserSpaceDetail().getAdminName());
-            info.setWebsite(user.getUuzcUserSpaceDetail().getUrl());
-            info.setTelephone(user.getUuzcUserSpaceDetail().getTel() != null ?
-                    user.getUuzcUserSpaceDetail().getTel() : user.getUuzcUserSpaceDetail().getAdminTel());
-            info.setLandine_tel(user.getUuzcUserSpaceDetail().getContactTel() != null ?
-                    user.getUuzcUserSpaceDetail().getContactTel() : user.getUuzcUserSpaceDetail().getAdminTel());
+            info.setContact(detail.getContactMan() != null ?
+                    detail.getContactMan() : detail.getAdminName());
+            info.setWebsite(detail.getUrl());
+            info.setTelephone(detail.getTel() != null ?
+                    detail.getTel() : detail.getAdminTel());
+            info.setLandine_tel(detail.getContactTel() != null ?
+                    detail.getContactTel() : detail.getAdminTel());
         }
-        return  info;
+        return info;
     }
 
     /**
@@ -105,7 +106,7 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/setHrAccount", method = RequestMethod.POST)
     public ModelMap setHrAccount(UuzcUserInfo user) throws Exception {
-        UuzcUserSpaceDetail detail = SystemSession.getUser().getUuzcUserSpaceDetail();
+        UuzcUserSpaceDetail detail = AccountUtils.getUuzcUserSpaceDetail(SystemSession.getUser().getSpaceUID());
         User userInfo = new User();
         userInfo.setHr((short) 1);
         userInfo.setName(user.getUsername());
@@ -124,7 +125,7 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/existusers", method = RequestMethod.GET)
     public ModelMap getExistUsers() throws Exception {
-        List<User> users = AccountUtils.getEmployees(SystemSession.getUser().getUuzcUserSpaceDetail().getBusinessCode());
+        List<User> users = AccountUtils.getEmployees(SystemSession.getUser().getSpaceUID());
         return success(users);
     }
 

src/main/webapp/resources/js/common/common.js

@@ -24,22 +24,24 @@ function getAccountInfo() {
 			$('.link-mall').attr('href', 'http://www.usoftmall.com/login/proxy');
 			window._hasAccountInfo = true;
 			var user = data.content;
-			// 管理员
-            if(user.uid == user.uuzcUserSpaceDetail.adminTel) {
-                // 如果是hr
-                if(user.hr == 1) {
+			if(null != data.space) {
+                // 管理员
+                if(user.uid == data.space.adminTel) {
+                    // 如果是hr
+                    if(user.hr == 1) {
+                        $('.link-job-get').show();
+                        $('.link-hr-set').hide();
+                    } else {
+                        $('.link-hr-set').show();
+                        $('.link-job-get').hide();
+                    }
+                } else {// 非管理员
                     $('.link-job-get').show();
                     $('.link-hr-set').hide();
-                } else {
-                    $('.link-hr-set').show();
-                    $('.link-job-get').hide();
-                }
-            } else {// 非管理员
-                $('.link-job-get').show();
-                $('.link-hr-set').hide();
-                var location = window.location.pathname;
-                if(location.indexOf('setHrAccount') > -1) {// 如果是在设置hr页面，非管理员跳转到首页
-                    window.location.href = 'http://www.ubtob.com/#/uuzcJob';
+                    var location = window.location.pathname;
+                    if(location.indexOf('setHrAccount') > -1) {// 如果是在设置hr页面，非管理员跳转到首页
+                        window.location.href = 'http://www.ubtob.com/#/uuzcJob';
+                    }
                 }
             }
 		} else {
@@ -288,7 +290,6 @@ function setHrAccount() {
         async: false,
         success: function(data) {
             if(data) {
-                console.log(data);
                 var result = data.result;
                 if(result == 'success') {
                     toastr.success('设置HR账号成功');
@@ -299,12 +300,12 @@ function setHrAccount() {
                     toastr.error('该企业HR账号已存在');
                 }
                 if(result == 'setFailure') {
-                    toastr.erroror('设置HR账号失败');
+                    toastr.error('设置HR账号失败');
                 }
             }
         },
         error: function (error) {
-            toastr.erroror(error);
+            toastr.error(error);
         }
     });
 }
@@ -384,8 +385,6 @@ $('#username').bind('input propertychange', function() {
     var nameList = [];
     $("#userList").find("li").remove();// 先清除以前的样式
     for(var i = 0; i < users.length; i++) {
-        console.log(users[i].name);
-        console.log($('#username').val());
         if(users[i].name.indexOf($('#username').val()) > -1) {
             nameList.push(users[i]);
         }