From 30068b0366757b6cae3cd6dda25e0622afcae795 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 13 四月 2023 11:17:05 +0800
Subject: [PATCH] 2023-04-13
---
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 2192239..34d4cbb 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -899,7 +899,7 @@
defaultSql = btn.verify.defaultSql || 'true'
_dataresource = btn.verify.dataresource || ''
queryType = btn.verify.queryType
- primaryKey = btn.verify.primaryKey || 'ID'
+ // primaryKey = btn.verify.primaryKey || 'ID'
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
@@ -1008,9 +1008,9 @@
if (btn.Ot === 'requiredOnce' && selectedData && selectedData.length > 0) {
primaryId = selectedData.map(d => d.$$uuid || '').filter(Boolean).join(',')
if (_search && primaryId) {
- _search += ` and ${primaryKey} in (select ID from dbo.SplitComma('${primaryId}'))`
+ _search += ` and ${primaryKey} in (select ${primaryKey} from dbo.SplitComma('${primaryId}'))`
} else if (primaryId) {
- _search = `where ${primaryKey} in (select ID from dbo.SplitComma('${primaryId}'))`
+ _search = `where ${primaryKey} in (select ${primaryKey} from dbo.SplitComma('${primaryId}'))`
}
}
--
Gitblit v1.8.0