From e2918aef00bca671eb604edfa883d5c7fd0cdff4 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Sun, 6 Nov 2022 18:39:51 +0800 Subject: [PATCH] delete false use '0' --- api/app/lib/controllers/alarm/app.js | 2 +- api/app/lib/controllers/alarm/video.js | 2 +- api/app/lib/controllers/control/analysis.js | 8 ++++---- api/app/lib/controllers/control/data.js | 6 +++--- api/app/lib/controllers/control/toolLink.js | 2 +- api/app/lib/controllers/organization/index.js | 8 ++++---- api/app/lib/controllers/project/index.js | 4 ++-- api/app/lib/controllers/push/config.js | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/api/app/lib/controllers/alarm/app.js b/api/app/lib/controllers/alarm/app.js index f49cf9c..03e8191 100644 --- a/api/app/lib/controllers/alarm/app.js +++ b/api/app/lib/controllers/alarm/app.js @@ -97,7 +97,7 @@ async function inspectionList(ctx) { } } 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(',')})`).toPromise() : + await clickHouse.pepEmis.query(`SELECT DISTINCT user.id AS id, "user"."name" AS name FROM user WHERE user.id IN (${[...notedUserIds].join(',')}, -1)`).toPromise() : [] for (let ins of inspectionRes) { if (ins.notedPepUserId) { diff --git a/api/app/lib/controllers/alarm/video.js b/api/app/lib/controllers/alarm/video.js index efc5c14..323c456 100644 --- a/api/app/lib/controllers/alarm/video.js +++ b/api/app/lib/controllers/alarm/video.js @@ -122,7 +122,7 @@ async function alarmList(ctx) { LEFT JOIN vender ON vender.id = camera.vender_id WHERE - camera.delete = false + camera.delete = '0' AND camera.recycle_time is null ${statusAlarmWhereOption.length ? 'AND ' + statusAlarmWhereOption.join(' AND ') : ''} AND alarmId IN ( diff --git a/api/app/lib/controllers/control/analysis.js b/api/app/lib/controllers/control/analysis.js index 5d26317..d3e51b7 100644 --- a/api/app/lib/controllers/control/analysis.js +++ b/api/app/lib/controllers/control/analysis.js @@ -62,8 +62,8 @@ async function personnelApp (ctx) { LEFT JOIN department ON department.id=department_user.department WHERE - user.id IN (${[...userIds].join(',')}) - AND department.delete=false` + user.id IN (${[...userIds].join(',')}, -1) + AND department.delete='0'` ).toPromise() : [] @@ -84,7 +84,7 @@ async function personnelApp (ctx) { // 查对应的项企项目信息 let pepProjectRes = pepPojectIds.size ? await clickHouse.projectManage.query(` - SELECT id, project_name, isdelete FROM t_pim_project WHERE id IN (${[...pepPojectIds]}) + SELECT id, project_name, isdelete FROM t_pim_project WHERE id IN (${[...pepPojectIds].join(',')}, -1) `).toPromise() : [] @@ -296,7 +296,7 @@ async function problem (ctx) { ON camera.serial_no = camera_status_alarm.serial_no AND camera.channel_no = camera_status_alarm.channel_no WHERE - camera.delete = false + camera.delete = '0' AND camera.recycle_time is null AND alarmId IN ( SELECT camera_status_alarm.id AS alarmId diff --git a/api/app/lib/controllers/control/data.js b/api/app/lib/controllers/control/data.js index a52223b..584830e 100644 --- a/api/app/lib/controllers/control/data.js +++ b/api/app/lib/controllers/control/data.js @@ -167,7 +167,7 @@ async function getVideoAlarmsAggDay(ctx) { ON camera.serial_no = camera_status_alarm.serial_no AND camera.channel_no = camera_status_alarm.channel_no WHERE - camera.delete = false + camera.delete = '0' AND camera.recycle_time is null ${statusAlarmWhereOption.length ? 'AND ' + statusAlarmWhereOption.join(' AND ') : ''} AND alarmId IN ( @@ -317,11 +317,11 @@ async function getLatestDynamic(ctx) { } } let pepProjects = pepPojectIds.size ? await clickHouse.projectManage.query(` - SELECT id, project_name FROM t_pim_project WHERE id IN (${[...pepPojectIds]}) + SELECT id, project_name FROM t_pim_project WHERE id IN (${[...pepPojectIds].join(',')},-1) `).toPromise() : []; 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(',')}) + `SELECT DISTINCT user.id AS id, "user"."name" AS name FROM user WHERE user.id IN (${[...notedUserIds].join(',')},-1) `).toPromise() : [] diff --git a/api/app/lib/controllers/control/toolLink.js b/api/app/lib/controllers/control/toolLink.js index 794bdfc..9b25d90 100644 --- a/api/app/lib/controllers/control/toolLink.js +++ b/api/app/lib/controllers/control/toolLink.js @@ -243,7 +243,7 @@ async function count (ctx) { LEFT JOIN vender ON vender.id = camera.vender_id WHERE - camera.delete = false + camera.delete = '0' AND camera.recycle_time is null AND alarmId IN ( SELECT camera_status_alarm.id AS alarmId diff --git a/api/app/lib/controllers/organization/index.js b/api/app/lib/controllers/organization/index.js index a742c49..1007c06 100644 --- a/api/app/lib/controllers/organization/index.js +++ b/api/app/lib/controllers/organization/index.js @@ -29,7 +29,7 @@ async function allUsers (ctx) { const userRes = await clickHouse.pepEmis.query(` SELECT id, name FROM user - WHERE delete = false + WHERE delete = '0' `).toPromise() ctx.status = 200; @@ -253,8 +253,8 @@ async function user (ctx) { LEFT JOIN department ON department.id=department_user.department WHERE - user.id IN (${[...userIds].join(',')}) - AND department.delete=false` + user.id IN (${[...userIds].join(',')},-1) + AND department.delete='0'` ).toPromise() : [] @@ -275,7 +275,7 @@ async function user (ctx) { // 查对应的项企项目信息 let pepProjectRes = pepPojectIds.size ? await clickHouse.projectManage.query(` - SELECT id, project_name, isdelete FROM t_pim_project WHERE id IN (${[...pepPojectIds]}) + SELECT id, project_name, isdelete FROM t_pim_project WHERE id IN (${[...pepPojectIds]},-1) `).toPromise() : [] diff --git a/api/app/lib/controllers/project/index.js b/api/app/lib/controllers/project/index.js index 0abf675..fdf0630 100644 --- a/api/app/lib/controllers/project/index.js +++ b/api/app/lib/controllers/project/index.js @@ -76,14 +76,14 @@ async function pomsProject (ctx) { ON t_pim_project.id = t_pim_project_construction.project_id LEFT JOIN t_pim_project_state ON t_pim_project_construction.construction_status_id = t_pim_project_state.id - WHERE id IN (${[...pepProjectIds].join(',')}) + WHERE id IN (${[...pepProjectIds].join(',')}, -1) ` ).toPromise() : [] const anxinProjectRes = anxinProjectIds.size ? - await clickHouse.anxinyun.query(`SELECT id,"name",project_state AS projectState FROM t_project WHERE id IN (${[...anxinProjectIds].join(',')})`).toPromise() : + await clickHouse.anxinyun.query(`SELECT id,"name",project_state AS projectState FROM t_project WHERE id IN (${[...anxinProjectIds].join(',')},-1)`).toPromise() : [] diff --git a/api/app/lib/controllers/push/config.js b/api/app/lib/controllers/push/config.js index 8e64b37..f9fdfb2 100644 --- a/api/app/lib/controllers/push/config.js +++ b/api/app/lib/controllers/push/config.js @@ -80,7 +80,7 @@ async function list (ctx) { // 查配置所包含的所有结构物 const allStrucRes = allStrucIds.size ? await clickHouse.anxinyun.query(` SELECT id, name FROM t_structure - WHERE id IN (${[...allStrucIds].join(',')}) + WHERE id IN (${[...allStrucIds].join(',')}, -1) `).toPromise() : [] // 查所有配置的推送的次数 @@ -98,7 +98,7 @@ async function list (ctx) { // 查询所有的用户信息 const userRes = allReceiverIds.size ? await clickHouse.pepEmis.query(` SELECT id, name, delete FROM user - WHERE id IN (${[...allReceiverIds].join(',')}) + WHERE id IN (${[...allReceiverIds].join(',')}, -1) `).toPromise() : [] let returnD = []