From 4a356e81b1a456f0cb16f61f548c46171c26c1b6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 十二月 2024 20:10:55 +0800
Subject: [PATCH] 2024-12-05

---
 src/utils/utils-custom.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 27a4c57..36ec3ff 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -4890,7 +4890,7 @@
     let DateCount = ''
     if (_dataresource) {
       /*system_query*/
-      if (/@pageSize@|@orderBy@|@mk_total/i.test(testSql)) {
+      if (/@pageSize@|@orderBy@|@mk_total/i.test(testSql) || (item.wrap && item.wrap.tree === 'true')) {
         LText = `select ${arr_field} from ${_dataresource} ${_search} `
       } else if (item.setting.laypage === 'true' && item.setting.order) {
         LText = `select top @pageSize@ ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${_search}) tmptable where rows > @pageSize@ * (@pageIndex@ - 1) order by tmptable.rows `

--
Gitblit v1.8.0