From d26ecdf69db28f9e3ac71834658e0fade6fcf5ca Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十月 2023 09:50:58 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/datasource/verifycard/utils.jsx | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index cea7779..dcf3980 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -101,9 +101,14 @@
let _regoptions = getSearchRegs(searches)
let _search = joinMainSearchkey(searches)
- _search = _search ? 'where ' + _search : ''
_regoptions.push({
+ reg: new RegExp('@userName@', 'ig'),
+ value: `'mk'`
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: `'mk'`
+ }, {
reg: new RegExp('@orderBy@', 'ig'),
value: setting.order || ''
}, {
@@ -128,8 +133,10 @@
if (_dataresource) {
if (custompage) {
_dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search}`
+ } else if (setting.laypage === 'true' && setting.order) {
+ _dataresource = `/*system_query*/select top 10 ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable where rows > 0 order by tmptable.rows`
} else if (setting.order) {
- _dataresource = `/*system_query*/select${setting.laypage === 'true' ? ' top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage === 'true' ? 'where rows > 0' : ''} order by tmptable.rows`
+ _dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows`
} else {
_dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search}`
}
@@ -200,6 +207,6 @@
})
}
- return { error, sql, errors: errors.join('锛�') }
+ return { error, sql, errors: errors.join('锛�'), custompage }
}
}
\ No newline at end of file
--
Gitblit v1.8.0