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 }) }} > 搜索