推荐人

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

@@ -1,18 +1,15 @@
 package com.ydtech.modules.admin.controller;
 
-import com.ydtech.aop.exception.DescribeException;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysProportionConfigMapper;
-import com.ydtech.modules.admin.model.SysAgencyLeader;
-import com.ydtech.modules.admin.model.SysPartner;
 import com.ydtech.modules.admin.model.SysProportionConfig;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.SysAgencyLeaderPageDto;
 import com.ydtech.modules.admin.model.dto.SysPartnerAPPPageDto;
 import com.ydtech.modules.admin.model.dto.SysPartnerDto;
 import com.ydtech.modules.admin.model.dto.SysPartnerPageDto;
 import com.ydtech.modules.admin.model.vo.AgencyExtractFeeVo;
-import com.ydtech.modules.admin.model.vo.SysAgencyLeaderVo;
 import com.ydtech.modules.admin.model.vo.SysPartnerAPPPageVo;
 import com.ydtech.modules.admin.model.vo.SysUserPartner;
 import com.ydtech.modules.admin.service.SysPartnerService;
@@ -77,7 +74,7 @@ public class SysPartnerController extends BaseController {
      */
     @GetMapping("/queryRecommendAndPartner/{id}/{level}")
     @ApiOperation(value = "根据部门id查询配置的推荐人接口")
-    public HttpResult<List<SysPartner>> queryRecommendAndPartner(@PathVariable(value = "id") @ApiParam("部门id") String id,@PathVariable(value = "level") @ApiParam("合伙人等级") Integer level) {
+    public HttpResult<List<SysUser>> queryRecommendAndPartner(@PathVariable(value = "id") @ApiParam("部门id") String id, @PathVariable(value = "level") @ApiParam("合伙人等级") Integer level) {
         return HttpResult.ok("success", this.sysPartnerService.queryRecommendAndPartner(id,level));
     }
 

src/main/java/com/ydtech/modules/admin/service/SysPartnerService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysPartner;
 import com.ydtech.modules.admin.model.SysPartnerAccount;
-import com.ydtech.modules.admin.model.SysPremiumDetails;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.vo.*;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -23,7 +23,7 @@ import java.util.List;
 public interface SysPartnerService extends IService<SysPartner> {
 
 
-    List<SysPartner> queryRecommendAndPartner(String id,Integer level);
+    List<SysUser> queryRecommendAndPartner(String id, Integer level);
 
     BasePageResult<SysUserPartner> queryByPage(SysPartnerPageDto sysPartnerPageDto);
 

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -102,16 +102,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
     private Map<String, WxMpService> wxMpService;
 
     @Override
-    public List<SysPartner> queryRecommendAndPartner(String id,Integer level) {
-        List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1)
-                .likeRight(SysPartner::getUserId, id).lt(SysPartner::getType,level).orderByDesc(SysPartner::getId));
-        if (sysPartnerList.size() > 0) {
-            for (SysPartner sysPartner : sysPartnerList) {
-                SysUser sysUser = sysUserMapper.selectById(sysPartner.getUserId());
-                sysPartner.setUserName(sysUser.getName());
-            }
+    public List<SysUser> queryRecommendAndPartner(String id,Integer level) {
+        List<SysUser> sysPartnerList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
+                .ne(SysUser::getStatus, 0)
+                .likeRight(SysUser::getId, id)
+                .eq(SysUser::getType,1)
+                .lt(SysUser::getLevel,level)
+                .orderByDesc(SysUser::getId));
 
-        }
         return sysPartnerList;
     }