From 102d4a9985980b246b6a2ec9e0ac171c37a659a5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 一月 2025 13:04:47 +0800
Subject: [PATCH] 2025-01-01

---
 src/utils/utils.js |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 0235f91..94e75c9 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -2176,18 +2176,27 @@
 
       item.field.split(',').forEach((_field, index) => {
         let _key = _field.toLowerCase()
-        let _val = datavars[_key] !== undefined ? datavars[_key] : ''
+        let _val = ''
+        let _val2 = ''
 
         arr.push(_key)
-        if (_key === 'bid' && !_val) { // 琛ㄥ崟涓病鏈塨id鍒欎娇鐢ㄧ郴缁焍id鍙橀噺
+        if (_key === 'bid') {
           _val = BID
+        } else {
+          _val = `@${_field}`
         }
-
-        _fieldValue.push(`${_key}='${_val}'`)
-        _value.push(`${_labels[index] || ''}锛�${_val || ''}`)
+        
+        if (_key === 'bid') {
+          _val2 = `' + ${BID} + '`
+        } else {
+          _val2 = `' + @${_field} + '`
+        }
+        
+        _fieldValue.push(`${_key}=${_val}`)
+        _value.push(`${_labels[index] || ''}锛�${_val2}`)
       })
 
-      if (!arr.includes(primaryKey.toLowerCase())) {
+      if (!arr.includes(primaryKey.toLowerCase()) && btn.Ot !== 'notRequired') {
         _fieldValue.push(`${primaryKey} !='${primaryId}'`)
       }
 

--
Gitblit v1.8.0