From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index a11cabd..4837ce6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -370,7 +370,7 @@
 
 
         //鎺掑簭瀛楁
-        String orderByResult = "id";
+        String orderByResult = "task_id";
         //姝e簭銆佸�掑彊
         String orderBySeq = "ASC";
         if (order != null) {
@@ -395,12 +395,14 @@
         }
         //鎺掑簭鏂瑰紡
         String orderBy = orderByResult + " " + orderBySeq;
-        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+        if (baseConditionVO != null) {
+            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+        }
 
         List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
         LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);
 
-        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
         //涓嶆槸瓒呯
         if (SecurityUtils.getClientId() != null) {
             eq = eq.eq(IpVolumeMission::getUserId, SecurityUtils.getUserId()).or(w -> {

--
Gitblit v1.9.3