diff --git a/src/main/java/com/gxwebsoft/common/system/service/UserRefereeService.java b/src/main/java/com/gxwebsoft/common/system/service/UserRefereeService.java index 72a8370..e715c4f 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/UserRefereeService.java +++ b/src/main/java/com/gxwebsoft/common/system/service/UserRefereeService.java @@ -40,4 +40,6 @@ public interface UserRefereeService extends IService { UserReferee getByIdRel(Integer id); UserReferee check(Integer dealerId, Integer userId); + + UserReferee getByUserId(Integer userId); } diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserRefereeServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserRefereeServiceImpl.java index 304c3d8..9662982 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserRefereeServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserRefereeServiceImpl.java @@ -62,4 +62,13 @@ public class UserRefereeServiceImpl extends ServiceImpl() + .eq(UserReferee::getUserId, userId) + .last("limit 1") + ); + } + } diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java index a267195..b7e2724 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java @@ -52,6 +52,8 @@ public class UserServiceImpl extends ServiceImpl implements Us private RedisUtil redisUtil; @Resource private OrganizationService organizationService; + @Resource + private UserRefereeService userRefereeService; @Override public PageResult pageRel(UserParam param) { @@ -277,13 +279,19 @@ public class UserServiceImpl extends ServiceImpl implements Us * @param users 用户集合 */ private void selectUserRoles(List users) { - if (users != null && users.size() > 0) { + if (users != null && !users.isEmpty()) { List userIds = users.stream().map(User::getUserId).collect(Collectors.toList()); List userRoles = userRoleService.listByUserIds(userIds); for (User user : users) { List roles = userRoles.stream().filter(d -> user.getUserId().equals(d.getUserId())) .collect(Collectors.toList()); user.setRoles(roles); + // 上级 + UserReferee userReferee = userRefereeService.getByUserId(user.getUserId()); + if (userReferee != null) { + User parent = getByIdRel(userReferee.getDealerId()); + user.setReferee(parent); + } } } }