From 0bff15b120b3e3ff1f1c3d2ce4d9aa8d3ad3917e Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 06 十一月 2020 13:49:44 +0800 Subject: [PATCH] 2020-11-06 --- src/templates/zshare/verifycard/index.jsx | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx index 99662d8..427775d 100644 --- a/src/templates/zshare/verifycard/index.jsx +++ b/src/templates/zshare/verifycard/index.jsx @@ -523,6 +523,8 @@ } resolve(_fields) }) + } else { + resolve(_fields) } }).then(_fields => { let _usefulfields = ['BID', 'ID', 'LoginUID', 'SessionUid', 'UserID', 'Appkey', 'UserName', 'FullName', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'ModularDetailCode'] @@ -568,12 +570,11 @@ } }) - if (!hasBid) { // 琛ㄥ崟涓鍔燘ID + if (!hasBid && (card.sqlType === 'insert' || card.sqlType === 'insertOrUpdate')) { // 琛ㄥ崟涓鍔燘ID _fields.unshift({ uuid: 'BID', field: 'BID', label: 'BID', type: 'text' }) fieldArr.push('bid') _declare.push(`@bid nvarchar(50)`) _select.push(`@bid=''`) - } let hasColumn = false @@ -646,7 +647,12 @@ if (!item.field) return keys.push(item.field.toLowerCase()) - values.push('@' + item.field) + + if (item.field.toLowerCase() === 'bid' && item.uuid === 'BID') { + values.push('@BID@') + } else { + values.push('@' + item.field) + } }) if (config.setting.primaryKey && !keys.includes(config.setting.primaryKey.toLowerCase())) { @@ -674,7 +680,7 @@ values = values.join(', ') _insertsql = `insert into ${card.sql} (${keys}) select ${values};` } - + if (card.sqlType === 'update' || card.sqlType === 'audit' || card.sqlType === 'insertOrUpdate') { let _form = [] let _arr = [] @@ -734,7 +740,7 @@ ${_updatesql} end ` - } else if (card.sqlType === 'LogicDelete') { + } else if (card.sqlType === 'LogicDelete' || card.sqlType === 'custom') { _defaultsql = `update ${card.sql} set deleted=1,modifydate=getdate(),modifyuserid=@userid@ where ${config.setting.primaryKey}${card.Ot !== 'requiredOnce' ? '=@ID@' : ' in (select ID from dbo.SplitComma(@ID@))'};` } else if (card.sqlType === 'delete') { let _msg = '' -- Gitblit v1.8.0