From 7268d7dbfc33ff6dea9ee8fb218649a7e041098b Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Tue, 22 Feb 2022 20:34:42 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8FBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/business/english/word/index.vue | 22 ++++++++++++++-----
 .../business/webmagic/weixinsougou/index.vue  | 15 +++++++++++--
 .../java/com/xjs/web/MyBaseController.java    |  2 ++
 .../mapper/webmagic/WeiXinSouGouMapper.xml    |  2 +-
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/business/english/word/index.vue b/ruoyi-ui/src/views/business/english/word/index.vue
index 89d5df3e..44ed8d88 100644
--- a/ruoyi-ui/src/views/business/english/word/index.vue
+++ b/ruoyi-ui/src/views/business/english/word/index.vue
@@ -327,6 +327,9 @@ export default {
       // 默认排序
       defaultSort: {prop: 'createTime', order: 'descending'},
 
+      //标记排序重置（修复点击重置请求两次接口BUG）
+      sortStatus: true,
+
       // 表单校验
       rulesEdit: {
         englishWord: [
@@ -413,9 +416,6 @@ export default {
         this.queryParams.endCreateTime = this.daterangeCreateTime[1];
       }
 
-      // this.queryParams.orderByColumn=this.defaultSort.prop
-      // this.queryParams.isAsc=this.defaultSort.order
-
       listWord(this.queryParams).then(response => {
         this.loading = false;
         this.wordList = response.data.records;
@@ -453,6 +453,11 @@ export default {
       this.daterangeCreateTime = [];
       this.queryParams.createTime = null
       this.queryParams.endCreateTime = null
+
+      this.sortStatus=false
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.sortStatus=true
+
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -474,9 +479,16 @@ export default {
     },
 
     /** 排序触发事件 */
-    handleSortChange(column, prop, order) {
+    handleSortChange(column) {
       this.queryParams.isAsc = column.order;
-      this.getList();
+      this.queryParams.orderByColumn = column.prop;
+
+      console.log(column)
+
+      //点击重置的时候不再次请求接口
+      if (this.sortStatus) {
+        this.getList();
+      }
     },
 
     /** 修改按钮操作 */
diff --git a/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue b/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue
index 02d0e97a..5b75c40c 100644
--- a/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue
+++ b/ruoyi-ui/src/views/business/webmagic/weixinsougou/index.vue
@@ -195,7 +195,10 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {},
+
+      //标记排序重置（修复点击重置请求两次接口BUG）
+      sortStatus: true,
     };
   },
   created() {
@@ -222,7 +225,10 @@ export default {
     /** 排序触发事件 */
     handleSortChange(column, prop, order) {
       this.queryParams.isAsc = column.order;
-      this.getList();
+      //点击重置的时候不再次请求接口
+      if (this.sortStatus) {
+        this.getList();
+      }
     },
 
     //重置排序
@@ -242,6 +248,11 @@ export default {
       this.daterangeCreateTime = [];
       this.queryParams.createTime = null
       this.queryParams.endCreateTime = null
+
+      this.sortStatus=false
+      this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+      this.sortStatus=true
+
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyBaseController.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyBaseController.java
index 55625fff..0dc7dbeb 100644
--- a/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyBaseController.java
+++ b/xjs-business/xjs-business-common/src/main/java/com/xjs/web/MyBaseController.java
@@ -32,6 +32,8 @@ public class MyBaseController<T> extends BaseController {
         }
         String orderByColumn = pageDomain.getOrderByColumn();
         if (StringUtils.isNotNull(orderByColumn)) {
+
+            //获取排序字段
             String orderBy = SqlUtil.escapeOrderBySql(StringUtils.toUnderScoreCase(orderByColumn));
 
             if (pageDomain.getIsAsc().equals("asc")) {
diff --git a/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/WeiXinSouGouMapper.xml b/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/WeiXinSouGouMapper.xml
index e9397b87..fa1feb9b 100644
--- a/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/WeiXinSouGouMapper.xml
+++ b/xjs-business/xjs-business-webmagic/src/main/resources/mapper/webmagic/WeiXinSouGouMapper.xml
@@ -47,7 +47,7 @@
             SELECT
                 t.min_id
             FROM
-                    ( SELECT min( id ) AS min_id FROM webmagic_weixin_sougou GROUP BY url ) AS t
+                    ( SELECT min( id ) AS min_id FROM webmagic_weixin_sougou GROUP BY content ) AS t
         )
     </delete>
 </mapper>
\ No newline at end of file