github/cool-admin-midway-packages
1
0
Fork 0
mirror of https://github.com/cool-team-official/cool-admin-midway-packages.git synced 2025-12-15 08:22:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

去除无用代码

Browse Source
This commit is contained in:
cool 2024-04-24 17:24:00 +08:00
parent d117b84dd1
commit 5d51aa76c7
3 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/service/mysql.ts
View File

@ -67,7 +67,7 @@ export abstract class BaseMysqlService {
*/ */
setSql(condition, sql, params) { setSql(condition, sql, params) {
let rSql = false; let rSql = false;
if (condition || (condition === 0 && condition !== "")) { if (condition || condition === 0) {
rSql = true; rSql = true;
this.sqlParams = this.sqlParams.concat(params); this.sqlParams = this.sqlParams.concat(params);
} }
@ -390,8 +390,7 @@ export abstract class BaseMysqlService {
for (const item of wheres) { for (const item of wheres) {
if ( if (
item.length == 2 || item.length == 2 ||
(item.length == 3 && (item.length == 3 && (item[2] || item[2] === 0))
(item[2] || (item[2] === 0 && item[2] != "")))
) { ) {
for (const key in item[1]) { for (const key in item[1]) {
this.sqlParams.push(item[1][key]); 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}%`; keyWord = `%${keyWord}%`;
find.andWhere( find.andWhere(
new Brackets((qb) => { new Brackets((qb) => {
@ -447,7 +446,7 @@ export abstract class BaseMysqlService {
} }
// 单表字段无别名的情况下操作 // 单表字段无别名的情况下操作
if (typeof key === "string") { if (typeof key === "string") {
if (query[key] || (query[key] == 0 && query[key] != "")) { if (query[key] || query[key] === 0) {
c[key] = query[key]; c[key] = query[key];
const eq = query[key] instanceof Array ? "in" : "="; const eq = query[key] instanceof Array ? "in" : "=";
if (eq === "in") { if (eq === "in") {
@ -458,10 +457,7 @@ export abstract class BaseMysqlService {
this.sqlParams.push(query[key]); this.sqlParams.push(query[key]);
} }
} else { } else {
if ( if (query[key.requestParam] || query[key.requestParam] === 0) {
query[key.requestParam] ||
(query[key.requestParam] == 0 && query[key.requestParam] !== "")
) {
c[key.column] = query[key.requestParam]; c[key.column] = query[key.requestParam];
const eq = query[key.requestParam] instanceof Array ? "in" : "="; const eq = query[key.requestParam] instanceof Array ? "in" : "=";
if (eq === "in") { if (eq === "in") {

14
core/src/service/postgres.ts
View File

@ -66,7 +66,7 @@ export abstract class BasePgService {
*/ */
setSql(condition, sql, params) { setSql(condition, sql, params) {
let rSql = false; let rSql = false;
if (condition || (condition === 0 && condition !== "")) { if (condition || condition === 0) {
rSql = true; rSql = true;
for (let i = 0; i < params.length; i++) { for (let i = 0; i < params.length; i++) {
const param = params[i]; const param = params[i];
@ -446,8 +446,7 @@ export abstract class BasePgService {
for (const item of wheres) { for (const item of wheres) {
if ( if (
item.length == 2 || item.length == 2 ||
(item.length == 3 && (item.length == 3 && (item[2] || item[2] === 0))
(item[2] || (item[2] === 0 && item[2] != "")))
) { ) {
for (const key in item[1]) { for (const key in item[1]) {
this.sqlParams.push(item[1][key]); 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}%`; keyWord = `%${keyWord}%`;
find.andWhere( find.andWhere(
new Brackets((qb) => { new Brackets((qb) => {
@ -509,7 +508,7 @@ export abstract class BasePgService {
} }
// 单表字段无别名的情况下操作 // 单表字段无别名的情况下操作
if (typeof key === "string") { if (typeof key === "string") {
if (query[key] || (query[key] == 0 && query[key] != "")) { if (query[key] || query[key] == 0) {
c[key] = query[key]; c[key] = query[key];
const eq = query[key] instanceof Array ? "in" : "="; const eq = query[key] instanceof Array ? "in" : "=";
if (eq === "in") { if (eq === "in") {
@ -520,10 +519,7 @@ export abstract class BasePgService {
this.sqlParams.push(query[key]); this.sqlParams.push(query[key]);
} }
} else { } else {
if ( if (query[key.requestParam] || query[key.requestParam] == 0) {
query[key.requestParam] ||
(query[key.requestParam] == 0 && query[key.requestParam] !== "")
) {
c[key.column] = query[key.requestParam]; c[key.column] = query[key.requestParam];
const eq = query[key.requestParam] instanceof Array ? "in" : "="; const eq = query[key.requestParam] instanceof Array ? "in" : "=";
if (eq === "in") { if (eq === "in") {

14
core/src/service/sqlite.ts
View File

@ -67,7 +67,7 @@ export abstract class BaseSqliteService {
*/ */
setSql(condition, sql, params) { setSql(condition, sql, params) {
let rSql = false; let rSql = false;
if (condition || (condition === 0 && condition !== "")) { if (condition || condition === 0) {
rSql = true; rSql = true;
for (let i = 0; i < params.length; i++) { for (let i = 0; i < params.length; i++) {
const param = params[i]; const param = params[i];
@ -423,8 +423,7 @@ export abstract class BaseSqliteService {
for (const item of wheres) { for (const item of wheres) {
if ( if (
item.length == 2 || item.length == 2 ||
(item.length == 3 && (item.length == 3 && (item[2] || item[2] === 0))
(item[2] || (item[2] === 0 && item[2] != "")))
) { ) {
for (const key in item[1]) { for (const key in item[1]) {
this.sqlParams.push(item[1][key]); 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}%`; keyWord = `%${keyWord}%`;
find.andWhere( find.andWhere(
new Brackets((qb) => { new Brackets((qb) => {
@ -480,7 +479,7 @@ export abstract class BaseSqliteService {
} }
// 单表字段无别名的情况下操作 // 单表字段无别名的情况下操作
if (typeof key === "string") { if (typeof key === "string") {
if (query[key] || (query[key] == 0 && query[key] != "")) { if (query[key] || query[key] == 0) {
c[key] = query[key]; c[key] = query[key];
const eq = query[key] instanceof Array ? "in" : "="; const eq = query[key] instanceof Array ? "in" : "=";
if (eq === "in") { if (eq === "in") {
@ -491,10 +490,7 @@ export abstract class BaseSqliteService {
// this.sqlParams.push(query[key]); // this.sqlParams.push(query[key]);
} }
} else { } else {
if ( if (query[key.requestParam] || query[key.requestParam] == 0) {
query[key.requestParam] ||
(query[key.requestParam] == 0 && query[key.requestParam] !== "")
) {
c[key.column] = query[key.requestParam]; c[key.column] = query[key.requestParam];
const eq = query[key.requestParam] instanceof Array ? "in" : "="; const eq = query[key.requestParam] instanceof Array ? "in" : "=";
if (eq === "in") { if (eq === "in") {