diff --git a/api/app/lib/controllers/organization/index.js b/api/app/lib/controllers/organization/index.js index fbda0d1..c06b9e2 100644 --- a/api/app/lib/controllers/organization/index.js +++ b/api/app/lib/controllers/organization/index.js @@ -80,7 +80,7 @@ async function editUser (ctx) { ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); ctx.status = 400; ctx.body = { - + message: typeof error == 'string' ? error : undefined } } } diff --git a/api/app/lib/controllers/project/index.js b/api/app/lib/controllers/project/index.js index 88f62b0..85062af 100644 --- a/api/app/lib/controllers/project/index.js +++ b/api/app/lib/controllers/project/index.js @@ -43,7 +43,7 @@ async function projectPManage (ctx) { const models = ctx.fs.dc.models; const { clickHouse } = ctx.app.fs - const projectRes = await clickHouse.projectManage.query(`SELECT * FROM t_project WHERE project_state = 4 ORDER BY id DESC`).toPromise() + const projectRes = await clickHouse.projectManage.query(`SELECT id, project_name FROM t_pim_project WHERE isdelete=0 ORDER BY id DESC`).toPromise() ctx.status = 200; ctx.body = projectRes