From 94ae24140315517b30867641426870add7420f0a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 2 Jun 2021 16:36:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8C=89=E7=8A=B6=E6=80=81=E6=8E=92=E5=BA=8F=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/index.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 287b26702d..32a9ff2ae0 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -309,8 +309,16 @@ export default {
 
   methods: {
     sortChange({ column, prop, order }) {
+      this.orderConditions = []
+      if (!order) {
+        this.search(this.last_condition)
+        return
+      }
       if (prop === 'dept') {
-        prop = 'deptId'
+        prop = 'u.deptId'
+      }
+      if (prop === 'status') {
+        prop = 'u.enabled'
       }
       this.orderConditions = []
       addOrder({ field: prop, value: order }, this.orderConditions)