|
|
@@ -1,6 +1,7 @@
|
|
|
package com.tianhu.system.controller;
|
|
|
|
|
|
import com.tianhu.common.core.domain.R;
|
|
|
+import com.tianhu.common.core.utils.CommonUtil;
|
|
|
import com.tianhu.common.core.utils.SecurityUtils;
|
|
|
import com.tianhu.common.core.utils.ServletUtils;
|
|
|
import com.tianhu.common.core.utils.StringUtils;
|
|
|
@@ -13,7 +14,11 @@ import com.tianhu.system.api.RemoteFileService;
|
|
|
import com.tianhu.system.api.domain.SysFile;
|
|
|
import com.tianhu.system.api.domain.SysUser;
|
|
|
import com.tianhu.system.api.model.LoginUser;
|
|
|
+import com.tianhu.system.domain.SysCompany;
|
|
|
+import com.tianhu.system.domain.SysUserCompanyRel;
|
|
|
+import com.tianhu.system.service.ISysCompanyService;
|
|
|
import com.tianhu.system.service.ISysDictDataService;
|
|
|
+import com.tianhu.system.service.ISysUserCompanyRelService;
|
|
|
import com.tianhu.system.service.ISysUserService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
@@ -45,6 +50,10 @@ public class SysProfileController extends BaseController
|
|
|
|
|
|
@Autowired
|
|
|
private RemoteFileService remoteFileService;
|
|
|
+ @Autowired
|
|
|
+ private ISysUserCompanyRelService iSysUserCompanyRelService;
|
|
|
+ @Autowired
|
|
|
+ private ISysCompanyService iSysCompanyService;
|
|
|
|
|
|
/**
|
|
|
* 个人信息
|
|
|
@@ -53,8 +62,17 @@ public class SysProfileController extends BaseController
|
|
|
public AjaxResult profile(@PathVariable String sscDomain)
|
|
|
{
|
|
|
LoginUser loginUser = tokenService.getLoginUser();
|
|
|
+ //用户id
|
|
|
+ String userId = CommonUtil.objToString(loginUser.getSysUser().getUserId());
|
|
|
+ //查询用户公司关联表
|
|
|
+ SysUserCompanyRel sysUserCompanyRel = iSysUserCompanyRelService.getById(userId);
|
|
|
+ //企业id
|
|
|
+ String companyId = sysUserCompanyRel.getSucrCompanyId();
|
|
|
+ //查询企业信息
|
|
|
+ SysCompany sysCompany = iSysCompanyService.getById(companyId);
|
|
|
AjaxResult ajax = AjaxResult.success(loginUser.getSysUser());
|
|
|
ajax.put("roleGroup", loginUser);
|
|
|
+ ajax.put("company",sysCompany);
|
|
|
return ajax;
|
|
|
}
|
|
|
|
peixh