Merge branch 'develop' of gitadmin/tuoheng_oidc into release

tuoheng_oidc_admin/src/main/java/com/tuoheng/service/impl/TenantServiceImpl.java

@@ -36,6 +36,7 @@ import com.tuoheng.model.vo.UserVo;
 import com.tuoheng.service.TenantService;
 import com.tuoheng.until.JsonResult;
 import com.tuoheng.until.MapUtils;
+import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -328,7 +329,7 @@ public class TenantServiceImpl implements TenantService {
         //开启分页
         IPage<TenantVo> page = new Page<>(query.getPage(), query.getLimit());
         IPage<TenantVo> pageData = tenantMapper.findList(page, query);
-        List<TenantVo> collect = pageData.getRecords().stream().map(x -> {
+        pageData.convert(x -> {
             TenantVo vo = new TenantVo();
             BeanUtils.copyProperties(x, vo);
             //并不是真正意义上的租户id
@@ -378,8 +379,7 @@ public class TenantServiceImpl implements TenantService {
             businessSystemVoList = businessSystemVoList.stream().distinct().collect(Collectors.toList());
             vo.setList(businessSystemVoList);
             return vo;
-        }).filter(x -> x != null).collect(Collectors.toList());
-        pageData.setRecords(collect);
+        });
         return JsonResult.success(pageData);
     }