From 667dbe1f6bfdb4dbf280999aecc9004a9c1e5b46 Mon Sep 17 00:00:00 2001 From: wenlele Date: Fri, 17 Mar 2023 16:14:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/project/index.js | 6 ++++-- web/client/src/sections/install/containers/system.jsx | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/api/app/lib/controllers/project/index.js b/api/app/lib/controllers/project/index.js index 6d7802c..58f2e2f 100644 --- a/api/app/lib/controllers/project/index.js +++ b/api/app/lib/controllers/project/index.js @@ -75,9 +75,11 @@ async function pomsProject (ctx) { let anxinProjectId = anxinProjectRes.map(v => v.id) findOption.where.$or = [ - { name: { $like: `%${keyword}%` } }, - { pepProjectId: { $in: projectId } }] + { name: { $like: `%${keyword}%` } },] if (projectId.length > 0) { + findOption.where.$or.push({ pepProjectId: { $in: projectId } }) + } + if (anxinProjectId.length > 0) { findOption.where.$or.push({ anxinProjectId: { $contains: anxinProjectId } }) } diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx index 12a9c47..e493cd7 100644 --- a/web/client/src/sections/install/containers/system.jsx +++ b/web/client/src/sections/install/containers/system.jsx @@ -370,7 +370,7 @@ const Example = (props) => { }} onClick={() => { setQuery({ limit: 10, page: 0 }) - getProjectPomsList({ limit: 10, page: 0 }) + // getProjectPomsList({ limit: 10, page: 0 }) }} > 搜索