From ae05a11abd1ed48fb0c221502c70eab3c516742b Mon Sep 17 00:00:00 2001 From: zhangxk Date: Thu, 20 Jul 2023 13:49:21 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(=E5=90=8E=E5=8F=B0):=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9D=E7=89=A9=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/db/Artifact.ts | 15 +++++++++++++-- shared/domain/backEndField/search.ts | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/shared/db/Artifact.ts b/shared/db/Artifact.ts index 02c143791..3df5b290b 100644 --- a/shared/db/Artifact.ts +++ b/shared/db/Artifact.ts @@ -118,12 +118,23 @@ export default class Artifact extends BaseModel { } private static getSearchObj(form: SearchArtifactParam) { - let { roleId, isShowDel } = form + let { roleId, minId, maxId, isShowDel } = form let searchObj = {}; - if (form.roleId) searchObj['roleId'] = roleId; + if (roleId) searchObj['roleId'] = roleId; if (isShowDel && isShowDel == 1) { searchObj['status'] = 1 } + + if (minId !== undefined && maxId !== undefined) { + searchObj['id'] = { $gte: minId, $lte: maxId }; + } + if (minId !== undefined && maxId == undefined) { + searchObj['id'] = { $gte: minId }; + } + if (minId == undefined && maxId != undefined) { + searchObj['id'] = { $lte: maxId }; + } + return searchObj } diff --git a/shared/domain/backEndField/search.ts b/shared/domain/backEndField/search.ts index 5bc81be15..9d850d760 100644 --- a/shared/domain/backEndField/search.ts +++ b/shared/domain/backEndField/search.ts @@ -40,6 +40,8 @@ export interface SearchItemParam { export interface SearchArtifactParam { roleId?: string; + minId?: number; + maxId?: number; isShowDel?: number; }