推荐人

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -12,6 +12,8 @@ import com.ydtech.constants.SysConstants;
 import com.ydtech.constants.sys.SysPasswordEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.dao.SysPartnerMapper;
+import com.ydtech.modules.admin.model.SysPartner;
 import com.ydtech.modules.admin.model.SysPassword;
 import com.ydtech.modules.admin.model.SysRole;
 import com.ydtech.modules.admin.model.SysUser;
@@ -79,6 +81,8 @@ public class SysLoginController {
 
     private final SysPartnerService sysPartnerService;
 
+    private final SysPartnerMapper sysPartnerMapper;
+
     private final SysAgencyLeaderService sysAgencyLeaderService;
 
     @GetMapping("captcha.jpg")
@@ -270,8 +274,10 @@ public class SysLoginController {
         boolean a = sysPartnerService.checkPartner(user.getId());
         boolean b = sysAgencyLeaderService.checkUserId(user.getId());
         if (a) {
+            SysPartner sysPartner = sysPartnerMapper.selectOne(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getUserId, user.getId()));
             //类型：1.合伙人;2机构负责人
             aapLoginVo.setType(1);
+            aapLoginVo.setLevel(sysPartner.getType());
         } else if (b) {
             aapLoginVo.setType(2);
         } else {

src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -231,14 +231,6 @@ public class SysUser extends BaseEntity {
     @ApiModelProperty(value = "合伙人等级；1，2，3，4，5")
     private Integer level;
 
-    @ApiModelProperty(value = "推荐人id")
-    @TableField(exist = false)
-    private String suggestId;
-
-    @ApiModelProperty(value = "推荐人name")
-    @TableField(exist = false)
-    private String suggestName;
-
     /**
      * 验证用户
      *

src/main/java/com/ydtech/modules/admin/model/vo/AAPLoginVo.java

@@ -13,4 +13,6 @@ public class AAPLoginVo {
 
     @ApiModelProperty(value = "类型：1.合伙人;2机构负责人")
     private int type;
+    @ApiModelProperty(value = "类型：合伙人等级")
+    private int level;
 }

src/main/java/com/ydtech/modules/admin/model/vo/AppSysPartnerVo.java

@@ -2,12 +2,16 @@ package com.ydtech.modules.admin.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.List;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class AppSysPartnerVo {
 
     /**