Browse Source

登录传递的企业信息修改处理

hejq 8 years ago
parent
commit
4fa80bb4dc

+ 15 - 15
src/main/java/com/uas/platform/home/controller/UuzcController.java

@@ -3,8 +3,8 @@ package com.uas.platform.home.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.account.entity.User;
-import com.uas.account.entity.UserSpaceDetail;
 import com.uas.account.entity.UserView;
+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.model.ResultInfo;
@@ -42,20 +42,20 @@ public class UuzcController extends BaseController {
                 map.put("ishr", true);
                 map.put("user", info);
                 map.put("usertype", "hr");
-            } else if(null != user.getUserSpaceDetail()) {// 先通过登录的信息判断是否是企业用户
+            } else if(null != user.getUuzcUserSpaceDetail()) {// 先通过登录的信息判断是否是企业用户
                 map.put("usertype", "company");
                 UuzcUserInfo info = getUserInfo(user, true);
                 //判断是否设置了hr
                 String result = AccountUtils.getHrAccount(info.getLicense());
                 ResultInfo resInfo = JSONObject.parseObject(result, ResultInfo.class);
                 map.put("hr", resInfo.getExistHr() ? true : false);
-                if(user.getName().equals(user.getUserSpaceDetail().getAdminName())) {
+                if(user.getName().equals(user.getUuzcUserSpaceDetail().getAdminName())) {
                     map.put("manager", true);
                 } else {
-                    map.put("managerName", user.getUserSpaceDetail().getAdminName());
+                    map.put("managerName", user.getUuzcUserSpaceDetail().getAdminName());
                 }
                 map.put("user", info);
-            } else if(null == user.getUserSpaceDetail()) {// 个人用户
+            } else if(null == user.getUuzcUserSpaceDetail()) {// 个人用户
                 UuzcUserInfo info = getUserInfo(user, false);
                 JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
                 map.put("user", formData);
@@ -83,16 +83,16 @@ public class UuzcController extends BaseController {
         info.setPassword(user.getPassword());
         info.setSalt(user.getSalt());
         info.setUsername(user.getName());
-        if(null != user.getUserSpaceDetail() && company) {
+        if(null != user.getUuzcUserSpaceDetail() && company) {
             info.setCompanyname(user.getSpaceName());
             info.setLicense(user.getSpaceUID());
-            info.setContact(user.getUserSpaceDetail().getContactMan() != null ?
-                    user.getUserSpaceDetail().getContactMan() : user.getUserSpaceDetail().getAdminName());
-            info.setWebsite(user.getUserSpaceDetail().getUrl());
-            info.setTelephone(user.getUserSpaceDetail().getTel() != null ?
-                    user.getUserSpaceDetail().getTel() : user.getUserSpaceDetail().getAdminTel());
-            info.setLandine_tel(user.getUserSpaceDetail().getContactTel() != null ?
-                    user.getUserSpaceDetail().getContactTel() : user.getUserSpaceDetail().getAdminTel());
+            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());
         }
         return  info;
     }
@@ -105,7 +105,7 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/setHrAccount", method = RequestMethod.POST)
     public ModelMap setHrAccount(UuzcUserInfo user) throws Exception {
-        UserSpaceDetail detail = SystemSession.getUser().getUserSpaceDetail();
+        UuzcUserSpaceDetail detail = SystemSession.getUser().getUuzcUserSpaceDetail();
         User userInfo = new User();
         userInfo.setHr((short) 1);
         userInfo.setName(user.getUsername());
@@ -124,7 +124,7 @@ public class UuzcController extends BaseController {
      */
     @RequestMapping(value = "/existusers", method = RequestMethod.GET)
     public ModelMap getExistUsers() throws Exception {
-        List<User> users = AccountUtils.getEmployees(SystemSession.getUser().getUserSpaceDetail().getBusinessCode());
+        List<User> users = AccountUtils.getEmployees(SystemSession.getUser().getUuzcUserSpaceDetail().getBusinessCode());
         return success(users);
     }
 

+ 12 - 6
src/main/webapp/WEB-INF/views/normal/index.html

@@ -64,12 +64,18 @@ var _hmt = _hmt || [];
 					<li><a href="#/finance" class="link-finance">金融服务</a></li><!-- http://finance.ubtob.com -->
 					<li><a href="#/uuzcJob" class="link-job">人才招聘</a></li><!-- http://public.ubtob.com -->
 					<li>
-						<a href="http://www.uuzcc.com/" class="">UU众创</a>
-						<ul>
-							<li><a href="http://zb.uuzcc.com/">任务外包</a></li>
-							<li><a href="http://fangan.uuzcc.com/">方案商城</a></li>
-							<li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>
-						</ul>
+						<!--<a href="http://www.uuzcc.com/" class="">UU众创</a>-->
+						<!--<ul>-->
+							<!--<li><a href="http://zb.uuzcc.com/">任务外包</a></li>-->
+							<!--<li><a href="http://fangan.uuzcc.com/">方案商城</a></li>-->
+							<!--<li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>-->
+						<!--</ul>-->
+                        <a href="#" class="x-link-info">UU众创</a>
+                        <ul>
+                            <li><a href="http://zb.uuzcc.com/">任务外包</a></li>
+                            <li><a href="http://fangan.uuzcc.com/">方案商城</a></li>
+                            <li><a href="http://bbs.uuzcc.com/forum.php">技术论坛</a></li>
+                        </ul>
 					</li><!-- http://public.ubtob.com -->
 					<li>
 						<a href="#/help" class="link-help">服务专区</a>

+ 9 - 0
src/main/webapp/resources/js/common/common.js

@@ -308,6 +308,12 @@ function setAccount(user) {
     $('#useruu').val(user.dialectUID);
 }
 
+/**
+ * 相关提示信息
+ */
+function suspendMessage() {
+    toastr.error('网站正在升级中,敬请期待!');
+}
 $(function() {
 	'use strict';
 	
@@ -346,4 +352,7 @@ $(function() {
 
     // 获取当前企业用户信息
     $('#existUsers').click(getExistUser);
+
+    // 点击众创链接给出提示
+    $('.x-link-info').click(suspendMessage);
 });