From c03d1ab00dd4a0f3239dac8429404a123037e5c9 Mon Sep 17 00:00:00 2001
From: fantasticit <fantasticit@163.com>
Date: Fri, 6 May 2022 23:15:30 +0800
Subject: [PATCH] fix: fix get recent documents

---
 packages/client/src/pages/index.tsx           | 18 ++++++++++++++-
 .../server/src/services/document.service.ts   | 22 ++++++++++---------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/pages/index.tsx b/packages/client/src/pages/index.tsx
index f58cbfa8..3224f970 100644
--- a/packages/client/src/pages/index.tsx
+++ b/packages/client/src/pages/index.tsx
@@ -2,7 +2,7 @@ import type { NextPage } from 'next';
 import type { IDocument } from '@think/domains';
 import Link from 'next/link';
 import React, { useMemo } from 'react';
-import { Typography, Button, Table, List } from '@douyinfe/semi-ui';
+import { Typography, Button, Table, List, Avatar } from '@douyinfe/semi-ui';
 import { useToggle } from 'hooks/use-toggle';
 import { Seo } from 'components/seo';
 import { DataRender } from 'components/data-render';
@@ -37,6 +37,7 @@ const RecentDocs = () => {
         title="标题"
         dataIndex="title"
         key="title"
+        width={200}
         render={(_, document: IDocument) => {
           return (
             <Link href={'/wiki/[wikiId]/document/[docId]'} as={`/wiki/${document.wikiId}/document/${document.id}`}>
@@ -46,6 +47,21 @@ const RecentDocs = () => {
         }}
       />,
       <Column title="阅读量" dataIndex="views" key="views" />,
+      <Column
+        title="创建者"
+        dataIndex="createUser"
+        key="createUser"
+        render={(createUser) => {
+          return (
+            <div>
+              <Avatar size="small" src={createUser.avatar} style={{ marginRight: 4 }}>
+                {createUser.name.slice(0, 1)}
+              </Avatar>
+              {createUser.name}
+            </div>
+          );
+        }}
+      />,
       <Column
         title="更新时间"
         dataIndex="updatedAt"
diff --git a/packages/server/src/services/document.service.ts b/packages/server/src/services/document.service.ts
index e24d66e1..f0899c19 100644
--- a/packages/server/src/services/document.service.ts
+++ b/packages/server/src/services/document.service.ts
@@ -598,18 +598,20 @@ export class DocumentService {
    * @returns
    */
   public async getRecentDocuments(user: OutUser) {
-    const query = await this.documentRepo
-      .createQueryBuilder('document')
-      .where('document.createUserId=:createUserId')
-      .andWhere('document.isWikiHome=:isWikiHome')
-      .setParameter('createUserId', user.id)
-      .setParameter('isWikiHome', 0);
+    const query = await this.documentAuthorityRepo
+      .createQueryBuilder('documentAuth')
+      .where('documentAuth.userId=:userId')
+      .andWhere('documentAuth.readable=:readable')
+      .setParameter('userId', user.id)
+      .setParameter('readable', 1);
 
-    query.orderBy('document.updatedAt', 'DESC');
-    query.take(10);
-    const documents = await query.getMany();
+    query.orderBy('documentAuth.updatedAt', 'DESC');
 
-    const docs = documents.map((doc) => instanceToPlain(doc));
+    query.take(20);
+
+    const documentIds = await (await query.getMany()).map((docAuth) => docAuth.documentId);
+    const documents = await this.documentRepo.findByIds(documentIds, { order: { updatedAt: 'DESC' } });
+    const docs = documents.filter((doc) => !doc.isWikiHome).map((doc) => instanceToPlain(doc));
 
     const res = await Promise.all(
       docs.map(async (doc) => {