From 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:37:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/topSearch/index.jsx | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 8e82f35..0e1c29d 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -188,20 +188,21 @@
// 鏁版嵁婧愭煡璇㈣鍙�
if (item.resourceType === '1' && item.dataSource) {
let _option = Utils.getSelectQueryOptions(item)
+ let _declare = `Declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20) select @mk_departmentcode='${sessionStorage.getItem('departmentcode') || ''}',@mk_organization='${sessionStorage.getItem('organization') || ''}',@mk_user_type='${sessionStorage.getItem('mk_user_type') || ''}'\n`
let exec = true
if (item.checkBid) {
- item.sql = _option.sql
+ item.sql = _declare + _option.sql
item.arr_field = _option.field
exec = !!BID
}
if (exec) {
- _option.sql = _option.sql.replace(/@BID@/ig, `'${BID || ''}'`)
+ let _sql = _option.sql.replace(/@BID@/ig, `'${BID || ''}'`)
if (window.GLOB.debugger === true) {
- console.info(_option.sql)
+ console.info(_declare + _sql)
}
// 娴嬭瘯绯荤粺鍗曚釜璇锋眰
@@ -209,13 +210,20 @@
deForms.push({
...item,
arr_field: _option.field,
- data_sql: Utils.formatOptions(_option.sql, window.GLOB.execType)
+ data_sql: Utils.formatOptions(_declare + _sql, window.GLOB.execType)
})
} else { // 鍚堝苟璇锋眰锛屽尯鍒嗘湰鍦板強绯荤粺
+ _sql = _sql.replace(/%/ig, ' mpercent ')
if (item.database === 'sso') {
- mainItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_option.sql.replace(/%/ig, ' mpercent ')))}' as LText`)
+ if (mainItems.length === 0) {
+ _sql = _declare + _sql
+ }
+ mainItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_sql))}' as LText`)
} else {
- localItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_option.sql.replace(/%/ig, ' mpercent ')))}' as LText`)
+ if (localItems.length === 0) {
+ _sql = _declare + _sql
+ }
+ localItems.push(`select '${item.field}' as obj_name,'${_option.field}' as arr_field,'${window.btoa(window.encodeURIComponent(_sql))}' as LText`)
}
}
}
--
Gitblit v1.8.0