From 0e76431e5bc06a60c8103b39aa3b26f05bb2b810 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 十一月 2022 16:38:02 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/zshare/actionList/printbutton/index.jsx | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 9caedab..fc6b529 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -1459,13 +1459,23 @@
handleModelConfig = (config) => {
let roleId = sessionStorage.getItem('role_id') || '' // 瑙掕壊ID
+ let _sql = `Declare @mk_organization nvarchar(512) select @mk_organization='${sessionStorage.getItem('organization') || ''}'\n`
+ let _sso = _sql
+ let _local = _sql
config.fields = config.fields.map(cell => {
// 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
let _option = Utils.getSelectQueryOptions(cell)
- cell.data_sql = Utils.formatOptions(_option.sql)
- cell.base_sql = window.btoa(window.encodeURIComponent(_option.sql))
+ if (cell.database === 'sso') {
+ cell.data_sql = Utils.formatOptions(_sso + _option.sql)
+ _sso = ''
+ } else {
+ cell.data_sql = Utils.formatOptions(_local + _option.sql)
+ _local = ''
+ }
+
+ cell.base_sql = window.btoa(window.encodeURIComponent(_sql + _option.sql))
cell.arr_field = _option.field
}
--
Gitblit v1.8.0