diff --git a/src/utils/dbUitls.js b/src/utils/dbUitls.js index 18d3cf4..6d41bbf 100644 --- a/src/utils/dbUitls.js +++ b/src/utils/dbUitls.js @@ -3,7 +3,6 @@ const dbConfig = require("../config/db"); const {v4: uuid} = require("uuid"); const dayjs = require("dayjs"); const chalk = require("chalk"); -const {checkJson} = require("../tools"); const query = sql => new Promise((resolve, reject) => { this.pool?.getConnection((err, conn) => { if (err) { @@ -23,26 +22,24 @@ const query = sql => new Promise((resolve, reject) => { const insert = ({table, form}) => { let sql if (form.id) {//编辑 - let arr = Object.keys(form).filter(e => form[e]).map(e => { - if (typeof form[e] == "object") { - if (checkJson(form[e])) { - form[e] = JSON.stringify(form[e]).replace(/["']/g, "\\'") - console.log(form[e]) - } else form[e] = JSON.stringify(form[e]) + let arr = Object.entries(form).map(([e, v]) => { + if (v) { + if (typeof v == "object") { + v = JSON.stringify(v) + } } - return `${e}='${form[e]}'` + return `${e}='${v}'` }) sql = `update ${table} set ${arr.join(",")} where id='${form.id}'` } else {//新增 let cols = [], arr = [] - Object.keys(form).map(e => { - if (form[e]) { + Object.entries(form).map(([e, v]) => { + if (v) { cols.push(e) - if (typeof form[e] == "object") { - if (checkJson(form[e])) form[e] = JSON.stringify(form[e]).replace(/["']/g, "\\'") - else form[e] = JSON.stringify(form[e]) + if (typeof v == "object") { + v = JSON.stringify(v) } - arr.push(`'${form[e]}'`) + arr.push(`'${v}'`) } }) sql = `insert into ${table} (id,createTime,${cols.join(",")}) values('${uuid()}','${dayjs().format("YYYY-MM-DD HH:mm:ss")}',${arr.join(",")})`