From d49124329b0119ba0ce7c69afbe2b864209e2495 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十月 2023 11:58:11 +0800
Subject: [PATCH] 2023-10-25

---
 src/menu/datasource/verifycard/utils.jsx |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index cea7779..2a79dee 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}`
       }

--
Gitblit v1.8.0