Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/esm/service/EsmUserReferrerService.java

@@ -58,6 +58,7 @@ public interface EsmUserReferrerService extends IService<EsmUserReferrer> {
     public Page<SysUser> getUserPage(Page page, SysUserDto dto);
 
     public Page<QueryChannel> getQueryChannelPage(Page page, QueryChannel queryChannel);
+
 }
 
 

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -51,13 +51,14 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
     // 递归查找节点的所有父级节点
     public List<EsmUserReferrer> findParents(String userId) {
         List<EsmUserReferrer> referrers = new ArrayList<>();
+
         EsmUserReferrer esmUserReferrer = esmUserReferrerService.getById(userId);
         //找不到用户的推荐关系
         if(esmUserReferrer == null){
             return null;
         }
         List<EsmUserReferrer> esmUserReferrers = esmUserReferrerService.list(new LambdaQueryWrapper<EsmUserReferrer>().eq(EsmUserReferrer::getAffiliation, esmUserReferrer.getAffiliation()));
-        findParentsRecursive(userId, esmUserReferrers, referrers);
+        findParentsRecursive(esmUserReferrer.getReferrerId(), esmUserReferrers, referrers);
         return referrers;
     }