|
|
@@ -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);
|
|
|
}
|
|
|
|