From 742f7d11557526038d332e60a8c8ca18177bc4e4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 十月 2023 15:51:58 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/datasource/verifycard/index.jsx |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 0ed4d4c..8e452d1 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -659,6 +659,17 @@
 
       let _debugId = md5(r.sql)
 
+      if (r.custompage && _columns.findIndex(col => col.field === 'mk_total') === -1) {
+        Modal.warning({
+          title: `鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤鑷畾涔夊垎椤垫帓搴忔椂锛岃鍦ㄥ瓧娈甸泦涓坊鍔� mk_total銆俙,
+          okText: '鐭ラ亾浜�',
+          onOk: () => {
+            reject()
+          }
+        })
+        return
+      }
+
       if (debugId === _debugId) {
         resolve()
         return
@@ -693,7 +704,7 @@
               })
             }
 
-            if (!tail) {
+            if (!tail && setting.order) {
               let keys = setting.order.replace(/\s+(asc|desc)/ig, '').replace(/\s+/g, '')
               keys.split(',').forEach(field => {
                 if (new RegExp(`'${field}'`).test(result.message)) {

--
Gitblit v1.8.0