推荐人

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

@@ -57,6 +57,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -160,13 +161,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<SysUserBaseVO> records = userList.getRecords();
         if (!CollectionUtils.isEmpty(records)) {
             for (SysUserBaseVO record : records) {
-                if (record.getType() != 0) {
-                    String referrerId = record.getReferrerId();
-                    if (StringUtils.isNotEmpty(referrerId)) {
-                        record.setReferrerId(referrerId);
-                        SysUser sysUser = sysUserMapper.selectById(record.getReferrerId());
-                        record.setReferrerName(sysUser.getName());
-                    }
+                //合伙人APP邀请团队长查询推介人
+//                if (record.getType() != 0) {
+//                    String referrerId = record.getReferrerId();
+//                    if (StringUtils.isNotEmpty(referrerId)) {
+//                        record.setReferrerId(referrerId);
+//                        SysUser sysUser = sysUserMapper.selectById(record.getReferrerId());
+//                        record.setReferrerName(sysUser.getName());
+//                    }
+//                }
+                // 查询推荐人
+                EsmUserReferrer referrer = esmUserReferrerService.getById(record.getUserId());
+                if (ObjectUtils.isEmpty(referrer)) {
+                    record.setReferrerId(null);
+                    record.setReferrerName(null);
+                } else {
+                    record.setReferrerId(referrer.getReferrerId());
+                    record.setReferrerName(referrer.getReferrerName());
                 }
             }
         }
@@ -200,16 +211,26 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<SysUserBaseVO> records = backUserList.getRecords();
         if (!CollectionUtils.isEmpty(records)) {
             for (SysUserBaseVO record : records) {
-                if (record.getType() != 0) {
-                    Integer level = record.getLevel();
-                    if (level == null || level != 1) {
-                        String referrerId = record.getReferrerId();
-                        if (StringUtils.isNotEmpty(referrerId)) {
-                            record.setReferrerId(referrerId);
-                            SysUser sysUser = sysUserMapper.selectById(record.getReferrerId());
-                            record.setReferrerName(sysUser.getName());
-                        }
-                    }
+                //合伙人，机构负责人查询推荐人
+//                if (record.getType() != 0) {
+//                    Integer level = record.getLevel();
+//                    if (level == null || level != 1) {
+//                        String referrerId = record.getReferrerId();
+//                        if (StringUtils.isNotEmpty(referrerId)) {
+//                            record.setReferrerId(referrerId);
+//                            SysUser sysUser = sysUserMapper.selectById(record.getReferrerId());
+//                            record.setReferrerName(sysUser.getName());
+//                        }
+//                    }
+//                }
+                // 查询推荐人
+                EsmUserReferrer referrer = esmUserReferrerService.getById(record.getUserId());
+                if (ObjectUtils.isEmpty(referrer)) {
+                    record.setReferrerId(null);
+                    record.setReferrerName(null);
+                } else {
+                    record.setReferrerId(referrer.getReferrerId());
+                    record.setReferrerName(referrer.getReferrerName());
                 }
             }
         }