|
@@ -3,10 +3,14 @@ package com.fdkankan.manage.controller;
|
|
|
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
import com.fdkankan.manage.common.ResultCode;
|
|
import com.fdkankan.manage.common.ResultCode;
|
|
|
|
+import com.fdkankan.manage.entity.JyPlatform;
|
|
|
|
+import com.fdkankan.manage.entity.JyUser;
|
|
import com.fdkankan.manage.exception.BusinessException;
|
|
import com.fdkankan.manage.exception.BusinessException;
|
|
import com.fdkankan.manage.common.ResultData;
|
|
import com.fdkankan.manage.common.ResultData;
|
|
import com.fdkankan.manage.entity.SysRole;
|
|
import com.fdkankan.manage.entity.SysRole;
|
|
import com.fdkankan.manage.entity.SysUser;
|
|
import com.fdkankan.manage.entity.SysUser;
|
|
|
|
+import com.fdkankan.manage.service.IJyPlatformService;
|
|
|
|
+import com.fdkankan.manage.service.IJyUserService;
|
|
import com.fdkankan.manage.service.ISysRoleService;
|
|
import com.fdkankan.manage.service.ISysRoleService;
|
|
import com.fdkankan.manage.service.ISysUserService;
|
|
import com.fdkankan.manage.service.ISysUserService;
|
|
import com.fdkankan.manage.service.impl.ManageService;
|
|
import com.fdkankan.manage.service.impl.ManageService;
|
|
@@ -31,6 +35,10 @@ public class SysUserController extends BaseController{
|
|
ISysRoleService sysRoleService;
|
|
ISysRoleService sysRoleService;
|
|
@Autowired
|
|
@Autowired
|
|
ManageService manageService;
|
|
ManageService manageService;
|
|
|
|
+ @Autowired
|
|
|
|
+ IJyUserService jyUserService;
|
|
|
|
+ @Autowired
|
|
|
|
+ IJyPlatformService jyPlatformService;
|
|
|
|
|
|
|
|
|
|
@GetMapping("/getInfo")
|
|
@GetMapping("/getInfo")
|
|
@@ -42,6 +50,15 @@ public class SysUserController extends BaseController{
|
|
userVo.setRoleId(role.getId());
|
|
userVo.setRoleId(role.getId());
|
|
userVo.setRoleName(role.getRoleName());
|
|
userVo.setRoleName(role.getRoleName());
|
|
BeanUtils.copyProperties(sysUser,userVo);
|
|
BeanUtils.copyProperties(sysUser,userVo);
|
|
|
|
+
|
|
|
|
+ JyUser jyUser = jyUserService.getBySysId(loginId);
|
|
|
|
+ if(jyUser !=null){
|
|
|
|
+ userVo.setPlatformId(jyUser.getPlatformId());
|
|
|
|
+ JyPlatform jyPlatform = jyPlatformService.getById(jyUser.getPlatformId());
|
|
|
|
+ if(jyPlatform != null){
|
|
|
|
+ userVo.setPlatformName(jyPlatform.getPlatformName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return ResultData.ok(userVo);
|
|
return ResultData.ok(userVo);
|
|
}
|
|
}
|
|
|
|
|