Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/user/service/impl/SysUserServiceImpl.java

@@ -87,8 +87,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepository, SysUserPO
     private SysTenantRepository tenantRepository;
     @Override
     public List<SysUserVO> stdSelectSysUserList(SysUserListQueryDTO query) {
-        SysTenantPO tenant = tenantRepository.selectById(LoginUserStrategy.tr.getTenantId());
         List<SysUserVO> result = baseMapper.stdSelectList(query);
+        SysTenantPO tenant = tenantRepository.selectById(LoginUserStrategy.tr.getTenantId());
         if(CollectionUtil.isNotEmpty(result)){
             for (SysUserVO user : result) {
                 user.setAdmin(StrUtil.equals(tenant.getTenantUserId(),user.getId()));