|
@@ -399,6 +399,7 @@ public class SysUserController extends BaseController {
|
|
|
})
|
|
})
|
|
|
@GetMapping(value = "/{userId}")
|
|
@GetMapping(value = "/{userId}")
|
|
|
public HttpResult findUserById(@PathVariable String userId) {
|
|
public HttpResult findUserById(@PathVariable String userId) {
|
|
|
|
|
+ SysUserInfoQuery sysUserVo = new SysUserInfoQuery();
|
|
|
// 查询用户
|
|
// 查询用户
|
|
|
SysUser sysUser = sysUserService.getById(userId);
|
|
SysUser sysUser = sysUserService.getById(userId);
|
|
|
// 查询角色
|
|
// 查询角色
|
|
@@ -407,6 +408,13 @@ public class SysUserController extends BaseController {
|
|
|
if (!ObjectUtils.isEmpty(sysUserRole)) {
|
|
if (!ObjectUtils.isEmpty(sysUserRole)) {
|
|
|
sysUser.setRoleId(StringUtils.toString(sysUserRole.getRoleId()));
|
|
sysUser.setRoleId(StringUtils.toString(sysUserRole.getRoleId()));
|
|
|
}
|
|
}
|
|
|
|
|
+ if("19".equals(sysUser.getRoleId())){
|
|
|
|
|
+ SysUser operator = sysUserService.getById(sysUser.getOperatorCode());
|
|
|
|
|
+ sysUser.setReferrerId(operator!=null?operator.getId():"");
|
|
|
|
|
+ sysUser.setReferrerName(operator!=null?operator.getName():"");
|
|
|
|
|
+ sysUserVo.setSysUser(sysUser);
|
|
|
|
|
+ return HttpResult.ok(sysUserVo);
|
|
|
|
|
+ }
|
|
|
// 查询推荐人
|
|
// 查询推荐人
|
|
|
EsmUserReferrer referrer = esmUserReferrerService.getById(userId);
|
|
EsmUserReferrer referrer = esmUserReferrerService.getById(userId);
|
|
|
if (ObjectUtils.isEmpty(referrer)) {
|
|
if (ObjectUtils.isEmpty(referrer)) {
|
|
@@ -419,7 +427,7 @@ public class SysUserController extends BaseController {
|
|
|
//查询详情信息
|
|
//查询详情信息
|
|
|
SysUserInfo userInfo = sysUserInfoService.getById(userId);
|
|
SysUserInfo userInfo = sysUserInfoService.getById(userId);
|
|
|
|
|
|
|
|
- SysUserInfoQuery sysUserVo = new SysUserInfoQuery();
|
|
|
|
|
|
|
+
|
|
|
List<EsmUserImageQueryVo> esmUserImageQueryVo = esmUserImageService.getEsmUserImageQueryVo(userId);
|
|
List<EsmUserImageQueryVo> esmUserImageQueryVo = esmUserImageService.getEsmUserImageQueryVo(userId);
|
|
|
|
|
|
|
|
sysUserVo.setSysUser(sysUser);
|
|
sysUserVo.setSysUser(sysUser);
|