Browse Source

pepPojectIds

dev
巴林闲侠 2 years ago
parent
commit
75d7ca64ee
  1. 8
      api/app/lib/controllers/control/data.js
  2. 2
      api/app/lib/service/clickHouseClient.js

8
api/app/lib/controllers/control/data.js

@ -305,7 +305,9 @@ async function getLatestDynamic(ctx) {
//查项目名称 查用户名 //查项目名称 查用户名
let pepPojectIds = new Set(), notedUserIds = new Set(); let pepPojectIds = new Set(), notedUserIds = new Set();
for (let p of news) { for (let p of news) {
pepPojectIds.add(p.projectCorrelation.pepProjectId); if(p.projectCorrelation && p.projectCorrelation.pepProjectId){
pepPojectIds.add(p.projectCorrelation.pepProjectId);
}
if (p.emailSendLog) { if (p.emailSendLog) {
p.emailSendLog.toPepUserIds.map(u => { p.emailSendLog.toPepUserIds.map(u => {
@ -317,8 +319,8 @@ async function getLatestDynamic(ctx) {
} }
} }
let pepProjects = pepPojectIds.size ? await clickHouse.projectManage.query(` let pepProjects = pepPojectIds.size ? await clickHouse.projectManage.query(`
SELECT id, project_name FROM t_pim_project WHERE id IN (${[...pepPojectIds].join(',')},-1) SELECT id, project_name FROM t_pim_project WHERE id IN (${[...pepPojectIds].join(',')},-1)
`).toPromise() : []; `).toPromise() : [];
let userPepRes = notedUserIds.size ? await clickHouse.pepEmis.query( let userPepRes = notedUserIds.size ? await clickHouse.pepEmis.query(
`SELECT DISTINCT user.id AS id, "user"."name" AS name FROM user WHERE user.id IN (${[...notedUserIds].join(',')},-1) `SELECT DISTINCT user.id AS id, "user"."name" AS name FROM user WHERE user.id IN (${[...notedUserIds].join(',')},-1)

2
api/app/lib/service/clickHouseClient.js

@ -11,7 +11,7 @@ function factory (app, opts) {
app.fs.clickHouse[d.name] = new ClickHouse({ app.fs.clickHouse[d.name] = new ClickHouse({
url: url, url: url,
port: port, port: port,
debug: true || opts.dev, debug: opts.dev,
format: "json", format: "json",
basicAuth: user && password ? { basicAuth: user && password ? {
username: user, username: user,

Loading…
Cancel
Save