From a0962340b1e324b5f601f5519a924cb7b9066453 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Tue, 19 Nov 2024 22:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E6=9C=89=E4=B8=8A?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gxwebsoft/common/system/controller/MainController.java | 7 ++++++- src/main/java/com/gxwebsoft/common/system/entity/User.java | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index 09a3daa..6ff719d 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -88,6 +88,8 @@ public class MainController extends BaseController { private UserRoleService userRoleService; @Resource private CompanyService companyService; + @Resource + private UserRefereeService userRefereeService; @ApiOperation("用户登录") @@ -225,7 +227,10 @@ public class MainController extends BaseController { public ApiResult userInfo() { final Integer loginUserId = getLoginUserId(); 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); } diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java index a500a04..07f6144 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/User.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -319,6 +319,10 @@ public class User implements UserDetails { @TableField(exist = false) private String authCode; + @ApiModelProperty("是否有上级") + @TableField(exist = false) + private Boolean hasParent; + // @ApiModelProperty("企业信息") // @TableField(exist = false) // private Company companyInfo;