diff --git a/api/app/lib/controllers/latestMetadata/index.js b/api/app/lib/controllers/latestMetadata/index.js index b9c87f4..850d4f1 100644 --- a/api/app/lib/controllers/latestMetadata/index.js +++ b/api/app/lib/controllers/latestMetadata/index.js @@ -170,7 +170,7 @@ async function getMetadataFiles(ctx) { const { catalog, limit, offset, keywords, orderBy = 'updateAt', orderDirection = 'desc' } = ctx.query; const where = { catalog: catalog }; if (keywords) { - where['$or'] = [{ name: { $iLike: `%${keywords}%` } }, { type: { $iLike: `%${keywords}%` } }] + where['$or'] = [{ name: { $iLike: `%${keywords}%` } }, { type: { $iLike: `%${keywords}%` }, fileName: { $not: null } }] } const findObj = { include: [ diff --git a/web/client/src/sections/metadataManagement/containers/filesTable.js b/web/client/src/sections/metadataManagement/containers/filesTable.js index 5d9d1ad..9fa5beb 100644 --- a/web/client/src/sections/metadataManagement/containers/filesTable.js +++ b/web/client/src/sections/metadataManagement/containers/filesTable.js @@ -60,8 +60,7 @@ const FilesTable = (props) => { files: record.fileName ? [{ url: "\\assets\\files\\common\\" + record.fileName, name: record.fileName.split('_').pop() }] : [] - }, - // metadataModels: res.payload.data + } }); setModalVisible(true); } @@ -210,7 +209,7 @@ const FilesTable = (props) => { onEdit(record)}>编辑 confirmDelete(record.id)} + onConfirm={() => confirmDelete(record)} > 删除 marking(record.id)}>打标 {resourceApplicationsRecords.length === 0 ?