From f45b2ad61211cf2821cdaab07676c7906c96410a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 七月 2023 18:23:56 +0800
Subject: [PATCH] 2023-07-05

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

diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 93f129b..f9fdeb7 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -7,7 +7,7 @@
    * @return {Object}  setting       椤甸潰璁剧疆
    * @return {Array}   columns       鏄剧ず瀛楁
    */
-  static getDebugSql (setting, scripts, columns, searches = [], defSearch, timestamp) {
+  static getDebugSql (setting, scripts, columns, searches = [], defSearch, type, timestamp) {
     let sql = ''
     let error = ''
     let _dataresource = ''
@@ -55,6 +55,11 @@
     _dataresource = _dataresource.replace(/\$sum@/ig, '/*$sum@')
     _dataresource = _dataresource.replace(/@sum\$/ig, '@sum$*/')
 
+    if (type === 'calendar') {
+      _dataresource = _dataresource.replace(/@mk_year@/ig, '')
+      _customScript = _customScript.replace(/@mk_year@/ig, '')
+    }
+
     if (_customScript) {
       _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20),@mk_nation nvarchar(50),@mk_province nvarchar(50),@mk_city nvarchar(50),@mk_district nvarchar(50),@mk_address nvarchar(100) select @ErrorCode='',@retmsg =''
         ${_customScript}

--
Gitblit v1.8.0