用户列表新增上级信息

src/main/java/com/gxwebsoft/common/system/service/UserRefereeService.java

@@ -40,4 +40,6 @@ public interface UserRefereeService extends IService<UserReferee> {
     UserReferee getByIdRel(Integer id);
 
     UserReferee check(Integer dealerId, Integer userId);
+
+    UserReferee getByUserId(Integer userId);
 }

src/main/java/com/gxwebsoft/common/system/service/impl/UserRefereeServiceImpl.java

@@ -62,4 +62,13 @@ public class UserRefereeServiceImpl extends ServiceImpl<UserRefereeMapper, UserR
         );
     }
 
+    @Override
+    public UserReferee getByUserId(Integer userId) {
+        return getOne(
+                new LambdaQueryWrapper<UserReferee>()
+                        .eq(UserReferee::getUserId, userId)
+                        .last("limit 1")
+        );
+    }
+
 }

src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java

@@ -52,6 +52,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private RedisUtil redisUtil;
     @Resource
     private OrganizationService organizationService;
+    @Resource
+    private UserRefereeService userRefereeService;
 
     @Override
     public PageResult<User> pageRel(UserParam param) {
@@ -277,13 +279,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      * @param users 用户集合
      */
     private void selectUserRoles(List<User> users) {
-        if (users != null && users.size() > 0) {
+        if (users != null && !users.isEmpty()) {
             List<Integer> userIds = users.stream().map(User::getUserId).collect(Collectors.toList());
             List<Role> userRoles = userRoleService.listByUserIds(userIds);
             for (User user : users) {
                 List<Role> 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);
+                }
             }
         }
     }