From c519b4e51fe07bf13a2a7e44abd648b8dc0c083d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 23 六月 2020 12:12:12 +0800
Subject: [PATCH] 2020-06-23

---
 src/utils/utils.js |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/utils/utils.js b/src/utils/utils.js
index 771b170..483aad4 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -37,11 +37,20 @@
   /**
    * @description md5鍔犲瘑
    * @return {String}  str         鍔犲瘑涓�
-   * @return {String}  timestamp   鏃堕棿鎴�  
+   * @return {String}  timestamp   鏃堕棿鎴�
+   * @return {Boolean} isopenkey   鏄惁涓轰簯绔瘑閽�
    */
-  static encrypt (str, timestamp) {
-    let salt = 'mingke' // 鐩愬��
-    let _str = str + salt + timestamp
+  static encrypt (str, timestamp, isopenkey) {
+    let salt1 = 'mingke'    // sql璇硶鐩愬��
+    let salt2 = 'open_key'  // 浜戠鏁版嵁鎿嶄綔鐩愬��
+    let _str = ''
+
+    if (isopenkey) {
+      _str = salt2 + timestamp + str
+    } else {
+      _str = str + salt1 + timestamp
+    }
+
     if (_str.length > 8000) {
       _str = _str.slice(_str.length - 8000)
     }
@@ -1033,7 +1042,7 @@
     // 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
     _sql += `
         /* 鍑瘉鍙婄敤鎴蜂俊鎭垵濮嬪寲璧嬪�� */
-        select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}'
+        select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}', @BillCode='', @ModularDetailCode=''
         `
 
     if (_initCustomScript) {
@@ -1057,21 +1066,31 @@
         datasource = '(' + datasource + ') tb'
       }
 
-      let _ID = '=@ID@'
       if (btn.Ot === 'requiredOnce') {
-        _ID = ' in (select ID from  dbo.SplitComma(@ID@))'
-      }
-
-      _sql += `
+        _sql += `
         /* 澶辨晥楠岃瘉 */
         select @tbid='', @ErrorCode='',@retmsg=''
-        select @tbid=${primaryKey} from ${datasource} where ${primaryKey} ${_ID}
+        select @tbid='X' from ${datasource} right join (select ID from  dbo.SplitComma(@ID@)) sp
+        on tb.id =sp.id where tb.id is null
+
+        If @tbid!=''
+        Begin
+          select @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
+          goto aaa
+        end
+        `
+      } else {
+        _sql += `
+        /* 澶辨晥楠岃瘉 */
+        select @tbid='', @ErrorCode='',@retmsg=''
+        select @tbid=${primaryKey} from ${datasource} where ${primaryKey}=@ID@
         If @tbid=''
         Begin
           select @ErrorCode='E',@retmsg='鏁版嵁宸插け鏁�'
           goto aaa
         end
         `
+      }
     }
 
     // 姣旇緝楠岃瘉

--
Gitblit v1.8.0