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; }