From b6cbfb08b51e87e6eac995be8e7751815715e6a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 三月 2022 15:36:21 +0800
Subject: [PATCH] 2022-03-29

---
 src/menu/datasource/verifycard/utils.jsx |   29 +++++++----------------------
 1 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 65013fd..7537ed2 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -34,6 +34,12 @@
       })
     }
 
+    // if (/\$ex@.{1,50}@ex\$/.test(_dataresource)) {
+    //   error = '绯荤粺鍑芥暟' + _dataresource.match(/\$ex@.{1,50}@ex\$/g)[0].replace(/\$ex@|@ex\$/g, '') + '鏈畾涔�'
+    // } else if (/\$ex@.{1,50}@ex\$/.test(_customScript)) {
+    //   error = '绯荤粺鍑芥暟' + _customScript.match(/\$ex@.{1,50}@ex\$/g)[0].replace(/\$ex@|@ex\$/g, '') + '鏈畾涔�'
+    // }
+
     _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
     _customScript = _customScript.replace(/@\$|\$@/ig, '')
     _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
@@ -45,7 +51,7 @@
     _dataresource = _dataresource.replace(/@sum\$/ig, '@sum$*/')
 
     if (_customScript) {
-      _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@departmentcode nvarchar(50),@organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
+      _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
         ${_customScript}
       `
     }
@@ -150,27 +156,6 @@
         _customScript = _customScript.replace(item.reg, '0')
         originscript = originscript.replace(item.reg, '0')
       })
-
-      if (setting.varMark) {
-        originscript = originscript.replace(/@ErrorCode/ig, '')
-        originscript = originscript.replace(/@retmsg/ig, '')
-        originscript = originscript.replace(/@UserName@/ig, '').replace(/@UserName/ig, '')
-        originscript = originscript.replace(/@FullName@/ig, '').replace(/@FullName/ig, '')
-        originscript = originscript.replace(/@login_city@/ig, '').replace(/@login_city/ig, '')
-        originscript = originscript.replace(/@id@/ig, '').replace(/@id/ig, '')
-        originscript = originscript.replace(/@bid@/ig, '').replace(/@bid/ig, '')
-        originscript = originscript.replace(/@loginuid@/ig, '').replace(/@loginuid/ig, '')
-        originscript = originscript.replace(/@sessionuid@/ig, '').replace(/@sessionuid/ig, '')
-        originscript = originscript.replace(/@userid@/ig, '').replace(/@userid/ig, '')
-        originscript = originscript.replace(/@appkey@/ig, '').replace(/@appkey/ig, '')
-        originscript = originscript.replace(/@time_id@/ig, '').replace(/@time_id/ig, '')
-  
-        originscript = originscript.replace(new RegExp('@' + setting.varMark, 'ig'), '')
-
-        if (/@/ig.test(originscript)) {
-          error = '浣跨敤浜嗗彉閲忔爣璇嗗鐨勫瓧娈碉紒'
-        }
-      }
     }
 
     let sumSql = ''

--
Gitblit v1.8.0