用户信息接口新增是否有上级
This commit is contained in:
@@ -88,6 +88,8 @@ public class MainController extends BaseController {
|
|||||||
private UserRoleService userRoleService;
|
private UserRoleService userRoleService;
|
||||||
@Resource
|
@Resource
|
||||||
private CompanyService companyService;
|
private CompanyService companyService;
|
||||||
|
@Resource
|
||||||
|
private UserRefereeService userRefereeService;
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation("用户登录")
|
@ApiOperation("用户登录")
|
||||||
@@ -225,7 +227,10 @@ public class MainController extends BaseController {
|
|||||||
public ApiResult<User> userInfo() {
|
public ApiResult<User> userInfo() {
|
||||||
final Integer loginUserId = getLoginUserId();
|
final Integer loginUserId = getLoginUserId();
|
||||||
if (loginUserId != null) {
|
if (loginUserId != null) {
|
||||||
return success(userService.getByIdRel(getLoginUserId()));
|
User user = userService.getByIdRel(getLoginUserId());
|
||||||
|
UserReferee userReferee = userRefereeService.getByUserId(loginUserId);
|
||||||
|
user.setHasParent(userReferee != null);
|
||||||
|
return success(user);
|
||||||
}
|
}
|
||||||
return fail("loginUserId不存在", null);
|
return fail("loginUserId不存在", null);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -319,6 +319,10 @@ public class User implements UserDetails {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String authCode;
|
private String authCode;
|
||||||
|
|
||||||
|
@ApiModelProperty("是否有上级")
|
||||||
|
@TableField(exist = false)
|
||||||
|
private Boolean hasParent;
|
||||||
|
|
||||||
// @ApiModelProperty("企业信息")
|
// @ApiModelProperty("企业信息")
|
||||||
// @TableField(exist = false)
|
// @TableField(exist = false)
|
||||||
// private Company companyInfo;
|
// private Company companyInfo;
|
||||||
|
|||||||
Reference in New Issue
Block a user