|
@@ -77,8 +77,16 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public List<SysPartner> queryRecommendAndPartner(String id) {
|
|
public List<SysPartner> queryRecommendAndPartner(String id) {
|
|
|
- return sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1)
|
|
|
|
|
|
|
+ List<SysPartner> sysPartnerList = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1)
|
|
|
.likeRight(SysPartner::getUserId, id).orderByDesc(SysPartner::getId));
|
|
.likeRight(SysPartner::getUserId, id).orderByDesc(SysPartner::getId));
|
|
|
|
|
+ if (sysPartnerList.size()>0) {
|
|
|
|
|
+ for (SysPartner sysPartner : sysPartnerList) {
|
|
|
|
|
+ SysUser sysUser = sysUserMapper.selectById(sysPartner.getUserId());
|
|
|
|
|
+ sysPartner.setUserName(sysUser.getName());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+ return sysPartnerList;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -125,7 +133,10 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
if (sysPartner != null) {
|
|
if (sysPartner != null) {
|
|
|
user.setType("1");
|
|
user.setType("1");
|
|
|
user.setSuggestId(sysPartner.getSuggestId());
|
|
user.setSuggestId(sysPartner.getSuggestId());
|
|
|
- user.setSuggestName(sysPartner.getSuggestName());
|
|
|
|
|
|
|
+ SysUser sysUser = sysUserMapper.selectById(sysPartner.getSuggestId());
|
|
|
|
|
+ if (sysUser != null) {
|
|
|
|
|
+ user.setSuggestName(sysUser.getName());
|
|
|
|
|
+ }
|
|
|
user.setProportional(sysPartner.getProportional());
|
|
user.setProportional(sysPartner.getProportional());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|