From 5d51aa76c7d1401b77d252ee3b5b421c1f4e40cf Mon Sep 17 00:00:00 2001 From: cool Date: Wed, 24 Apr 2024 17:24:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/service/mysql.ts | 14 +++++--------- core/src/service/postgres.ts | 14 +++++--------- core/src/service/sqlite.ts | 14 +++++--------- 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/core/src/service/mysql.ts b/core/src/service/mysql.ts index 2935845..cd9764f 100644 --- a/core/src/service/mysql.ts +++ b/core/src/service/mysql.ts @@ -67,7 +67,7 @@ export abstract class BaseMysqlService { */ setSql(condition, sql, params) { let rSql = false; - if (condition || (condition === 0 && condition !== "")) { + if (condition || condition === 0) { rSql = true; this.sqlParams = this.sqlParams.concat(params); } @@ -390,8 +390,7 @@ export abstract class BaseMysqlService { for (const item of wheres) { if ( item.length == 2 || - (item.length == 3 && - (item[2] || (item[2] === 0 && item[2] != ""))) + (item.length == 3 && (item[2] || item[2] === 0)) ) { for (const key in item[1]) { this.sqlParams.push(item[1][key]); @@ -414,7 +413,7 @@ export abstract class BaseMysqlService { } } // 关键字模糊搜索 - if (keyWord || (keyWord == 0 && keyWord != "")) { + if (keyWord || keyWord === 0) { keyWord = `%${keyWord}%`; find.andWhere( new Brackets((qb) => { @@ -447,7 +446,7 @@ export abstract class BaseMysqlService { } // 单表字段无别名的情况下操作 if (typeof key === "string") { - if (query[key] || (query[key] == 0 && query[key] != "")) { + if (query[key] || query[key] === 0) { c[key] = query[key]; const eq = query[key] instanceof Array ? "in" : "="; if (eq === "in") { @@ -458,10 +457,7 @@ export abstract class BaseMysqlService { this.sqlParams.push(query[key]); } } else { - if ( - query[key.requestParam] || - (query[key.requestParam] == 0 && query[key.requestParam] !== "") - ) { + if (query[key.requestParam] || query[key.requestParam] === 0) { c[key.column] = query[key.requestParam]; const eq = query[key.requestParam] instanceof Array ? "in" : "="; if (eq === "in") { diff --git a/core/src/service/postgres.ts b/core/src/service/postgres.ts index a2abbde..51cd387 100644 --- a/core/src/service/postgres.ts +++ b/core/src/service/postgres.ts @@ -66,7 +66,7 @@ export abstract class BasePgService { */ setSql(condition, sql, params) { let rSql = false; - if (condition || (condition === 0 && condition !== "")) { + if (condition || condition === 0) { rSql = true; for (let i = 0; i < params.length; i++) { const param = params[i]; @@ -446,8 +446,7 @@ export abstract class BasePgService { for (const item of wheres) { if ( item.length == 2 || - (item.length == 3 && - (item[2] || (item[2] === 0 && item[2] != ""))) + (item.length == 3 && (item[2] || item[2] === 0)) ) { for (const key in item[1]) { this.sqlParams.push(item[1][key]); @@ -470,7 +469,7 @@ export abstract class BasePgService { } } // 关键字模糊搜索 - if (keyWord || (keyWord == 0 && keyWord != "")) { + if (keyWord || keyWord == 0) { keyWord = `%${keyWord}%`; find.andWhere( new Brackets((qb) => { @@ -509,7 +508,7 @@ export abstract class BasePgService { } // 单表字段无别名的情况下操作 if (typeof key === "string") { - if (query[key] || (query[key] == 0 && query[key] != "")) { + if (query[key] || query[key] == 0) { c[key] = query[key]; const eq = query[key] instanceof Array ? "in" : "="; if (eq === "in") { @@ -520,10 +519,7 @@ export abstract class BasePgService { this.sqlParams.push(query[key]); } } else { - if ( - query[key.requestParam] || - (query[key.requestParam] == 0 && query[key.requestParam] !== "") - ) { + if (query[key.requestParam] || query[key.requestParam] == 0) { c[key.column] = query[key.requestParam]; const eq = query[key.requestParam] instanceof Array ? "in" : "="; if (eq === "in") { diff --git a/core/src/service/sqlite.ts b/core/src/service/sqlite.ts index acd5ecc..43dd440 100644 --- a/core/src/service/sqlite.ts +++ b/core/src/service/sqlite.ts @@ -67,7 +67,7 @@ export abstract class BaseSqliteService { */ setSql(condition, sql, params) { let rSql = false; - if (condition || (condition === 0 && condition !== "")) { + if (condition || condition === 0) { rSql = true; for (let i = 0; i < params.length; i++) { const param = params[i]; @@ -423,8 +423,7 @@ export abstract class BaseSqliteService { for (const item of wheres) { if ( item.length == 2 || - (item.length == 3 && - (item[2] || (item[2] === 0 && item[2] != ""))) + (item.length == 3 && (item[2] || item[2] === 0)) ) { for (const key in item[1]) { this.sqlParams.push(item[1][key]); @@ -447,7 +446,7 @@ export abstract class BaseSqliteService { } } // 关键字模糊搜索 - if (keyWord || (keyWord == 0 && keyWord != "")) { + if (keyWord || keyWord === 0) { keyWord = `%${keyWord}%`; find.andWhere( new Brackets((qb) => { @@ -480,7 +479,7 @@ export abstract class BaseSqliteService { } // 单表字段无别名的情况下操作 if (typeof key === "string") { - if (query[key] || (query[key] == 0 && query[key] != "")) { + if (query[key] || query[key] == 0) { c[key] = query[key]; const eq = query[key] instanceof Array ? "in" : "="; if (eq === "in") { @@ -491,10 +490,7 @@ export abstract class BaseSqliteService { // this.sqlParams.push(query[key]); } } else { - if ( - query[key.requestParam] || - (query[key.requestParam] == 0 && query[key.requestParam] !== "") - ) { + if (query[key.requestParam] || query[key.requestParam] == 0) { c[key.column] = query[key.requestParam]; const eq = query[key.requestParam] instanceof Array ? "in" : "="; if (eq === "in") {