人才招聘功能优化

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

@@ -38,34 +38,53 @@ public class UuzcController extends BaseController {
         UserView user = SystemSession.getUser();
         ModelMap map = new ModelMap();
         if(null != user) {
-            //先判断个人账户类型
-            String personalUrl = "http://job.uuzcc.com/index.php?m=&c=ubtob&a=check_user&uc_uid=" + user.getDialectUID();
-            HttpUtil.ResponseWrap responseWrap =  HttpUtil.doGet(personalUrl);
-            if(responseWrap.isSuccess()) {
-                ResultInfo userInfo = JSONObject.parseObject(responseWrap.getContent(), ResultInfo.class);
-                if(null != userInfo.getData()) {
-                    if(userInfo.getData().getCode().equals("2")) {//个人用户
-                        UuzcUserInfo info = getUserInfo(user, false);
-                        JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
-                        map.put("user", formData);
-                        map.put("usertype", "personal");
-                        return  map;
-                    } else if(userInfo.getData().getCode().equals("1")) {// 企业用户
-                        UuzcUserInfo info = getUserInfo(user, true);
-                        JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
-                        //判断是否设置了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())) {
-                            map.put("manager", true);
+            if ( null != user.getHr() && 1 == user.getHr()) {// hr账户
+                UuzcUserInfo info = getUserInfo(user, true);
+                map.put("ishr", true);
+                map.put("user", info);
+                map.put("usertype", "company");
+            } else {
+                //先判断个人账户类型
+                String personalUrl = "http://job.uuzcc.com/index.php?m=&c=ubtob&a=check_user&uc_uid=" + user.getDialectUID();
+                HttpUtil.ResponseWrap responseWrap =  HttpUtil.doGet(personalUrl);
+                if(responseWrap.isSuccess()) {
+                    ResultInfo userInfo = JSONObject.parseObject(responseWrap.getContent(), ResultInfo.class);
+                    if(null != userInfo.getData()) {
+                        if(userInfo.getData().getCode().equals("2")) {//个人用户
+                            UuzcUserInfo info = getUserInfo(user, false);
+                            JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
+                            map.put("user", formData);
+                            map.put("usertype", "personal");
+                            return  map;
+                        } else if(userInfo.getData().getCode().equals("1")) {// 企业用户
+                            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())) {
+                                map.put("manager", true);
+                            } else {
+                                map.put("managerName", user.getUserSpaceDetail().getAdminName());
+                            }
+                            map.put("user", info);
+                            map.put("usertype", "company");
+                        } else if(userInfo.getData().getCode().equals("0")) {// 如果是未注册信息，直接调用后面登录接口注册，在这个地方先判断
+                            if(null == SystemSession.getUser().getUserSpaceDetail()) {// 个人用户
+                                UuzcUserInfo info = getUserInfo(user, false);
+                                JSONObject formData = JSON.parseObject(JSON.toJSONString(info));
+                                map.put("user", formData);
+                                map.put("usertype", "personal");
+                            } else {// 企业用户
+                                UuzcUserInfo info = getUserInfo(user, true);
+                                map.put("user", info);
+                                map.put("usertype", "company");
+                            }
                         }
-                        map.put("user", info);
-                        map.put("usertype", "company");
                     }
+                } else {
+                    map.put("info", "信息验证失败");
                 }
-            } else {
-                map.put("info", "信息验证失败");
             }
         } else {
             SSOHelper.clearLogin(request, response);

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

@@ -7,7 +7,12 @@ function getAccountInfo() {
 		if (data.content) {
 			$('.x-nologin').hide();
 			$('.x-login').show();
-			$('.x-login').find('.title').text(data.content.name + '，' + data.content.spaceName);
+
+			if(null != data.content.spaceName) {
+                $('.x-login').find('.title').text(data.content.name + '，' + data.content.spaceName);
+            } else {
+                $('.x-login').find('.title').text(data.content.name);
+            }
 			$('.link-mall').attr('href', 'http://www.usoftmall.com/login/proxy');
 			window._hasAccountInfo = true;
 		}
@@ -74,19 +79,19 @@ function jobUuzcGet() {
         }
         var user = data.user;
         if(null != data && 'personal' == data.usertype) {
-            loginJobUuzc(user, loginUrl, 'user');
-            window.location.href = url;
+            alert("您的账号为个人账号，不可进行此操作");
         } else if(null != data && 'company' == data.usertype) {
-            if(data.manager) {// 管理员才能进行设置操作
-                if(!data.hr) {// 没有hr账号先设置hr
-                    window.location.href = window.location.origin + window.location.pathname + "setHrAccount";
+            if(data.ishr) {//如果是hr直接登录
+                loginJobUuzc(user, loginUrl, 'company');
+                window.location.href = url;
+            } else {// 非hr
+                if(data.manager) {// 管理员才能进行设置操作
+                    if(!data.hr) {// 没有hr账号先设置hr
+                        window.location.href = window.location.origin + window.location.pathname + "setHrAccount";
+                    }
                 } else {
-                    loginJobUuzc(user, loginUrl, 'company');
-                    window.location.href = url;
+                    alert('请通知管理员' + data.managerName + '设置HR账号');
                 }
-            } else {
-                loginJobUuzc(user, loginUrl, 'user');
-                window.location.href = url;
             }
         } else {
             data.content && (window.location.href = data.content);
@@ -102,6 +107,10 @@ function jobUuzcPost() {
     var url = 'http://job.uuzcc.com/';
     var loginUrl = 'http://job.uuzcc.com/index.php?m=&c=ubtob&a=login';
     $.get('uuzc/account/check', function(data) {
+        if(data.ishr) {
+            alert("您的账号为HR账号，不能进行此操作");
+            return;
+        }
         if(data.info) {
             alert(data.info);
         }
@@ -109,8 +118,8 @@ function jobUuzcPost() {
         if(null != data && null != data.usertype) {
             loginJobUuzc(user, loginUrl, 'user');
             window.location.href = url;
-        } else {
-            data.content && (window.location.href = data.content);
+        } else {// 求职时可以未登录
+            data.content && (window.location.href = url);
         }
     });
 }