From 82ca0f634812a225709368309ae7abc41d9c8011 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Thu, 23 Mar 2023 17:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=86=E7=BB=84=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sylive/groups-customer/index.vue                      | 2 +-
 src/views/sylive/groups-exchange/index.vue                      | 2 +-
 src/views/sylive/groups-order/index.vue                         | 2 +-
 src/views/sylive/groups-statistics/components/biz-table.vue     | 2 +-
 .../sylive/groups-statistics/components/consultant-table.vue    | 2 +-
 .../sylive/groups-statistics/components/customer-table.vue      | 2 +-
 src/views/sylive/groups-win/index.vue                           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/sylive/groups-customer/index.vue b/src/views/sylive/groups-customer/index.vue
index 70d6d59..a1bedd8 100644
--- a/src/views/sylive/groups-customer/index.vue
+++ b/src/views/sylive/groups-customer/index.vue
@@ -105,7 +105,7 @@
           limit,
           activityId: this.activityId
         });
-        if (!this.columns.length && result.columns) {
+        if (!order.sort && result.columns) {
           this.columns = result.columns;
         }
         return { count: result.count, list: result.list };
diff --git a/src/views/sylive/groups-exchange/index.vue b/src/views/sylive/groups-exchange/index.vue
index 345824d..04abfcc 100644
--- a/src/views/sylive/groups-exchange/index.vue
+++ b/src/views/sylive/groups-exchange/index.vue
@@ -191,7 +191,7 @@
           limit,
           activityId: this.activityId
         });
-        if (!this.columns.length && result.columns) {
+        if (!order.sort && result.columns) {
           this.columns = result.columns;
         }
         return { count: result.count, list: result.list };
diff --git a/src/views/sylive/groups-order/index.vue b/src/views/sylive/groups-order/index.vue
index 6128079..3d229f5 100644
--- a/src/views/sylive/groups-order/index.vue
+++ b/src/views/sylive/groups-order/index.vue
@@ -61,7 +61,7 @@
           limit,
           activityId: this.activityId
         });
-        if (!this.columns.length && result.columns) {
+        if (!order.sort && result.columns) {
           this.columns = result.columns;
         }
         return { count: result.count, list: result.list };
diff --git a/src/views/sylive/groups-statistics/components/biz-table.vue b/src/views/sylive/groups-statistics/components/biz-table.vue
index c31746c..be5c943 100644
--- a/src/views/sylive/groups-statistics/components/biz-table.vue
+++ b/src/views/sylive/groups-statistics/components/biz-table.vue
@@ -94,7 +94,7 @@
           itemId: this.itemId,
           levels: this.data.levels
         });
-        if (result.columns) {
+        if (!order.sort && result.columns) {
           this.columns = result.columns;
         }
         return { count: result.count, list: result.list };
diff --git a/src/views/sylive/groups-statistics/components/consultant-table.vue b/src/views/sylive/groups-statistics/components/consultant-table.vue
index 0d772de..c99535a 100644
--- a/src/views/sylive/groups-statistics/components/consultant-table.vue
+++ b/src/views/sylive/groups-statistics/components/consultant-table.vue
@@ -92,7 +92,7 @@
           itemId: this.itemId,
           levels: this.data.levels
         });
-        if (result.columns) {
+        if (!order.sort && result.columns) {
           this.columns = result.columns;
         }
         return { count: result.count, list: result.list };
diff --git a/src/views/sylive/groups-statistics/components/customer-table.vue b/src/views/sylive/groups-statistics/components/customer-table.vue
index 155c36d..a6fd3c9 100644
--- a/src/views/sylive/groups-statistics/components/customer-table.vue
+++ b/src/views/sylive/groups-statistics/components/customer-table.vue
@@ -111,7 +111,7 @@
           itemId: this.itemId,
           levels: this.data.levels
         });
-        if (result.columns) {
+        if (!order.sort && result.columns) {
           this.columns = result.columns;
         }
         return { count: result.count, list: result.list };
diff --git a/src/views/sylive/groups-win/index.vue b/src/views/sylive/groups-win/index.vue
index 1fa3d3b..8f89fe2 100644
--- a/src/views/sylive/groups-win/index.vue
+++ b/src/views/sylive/groups-win/index.vue
@@ -58,7 +58,7 @@
           limit,
           activityId: this.activityId
         });
-        if (!this.columns.length && result.columns) {
+        if (!order.sort && result.columns) {
           this.columns = result.columns;
         }
         return { count: result.count, list: result.list };