From 891f462e34c90372b8cb97e215bb9858839dc232 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 十月 2023 15:51:12 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/utils.jsx | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index d2d224a..dcf3980 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -133,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}`
}
@@ -205,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