From 3a2cba9e432dda111412494a3ddf2f2f92c2fd13 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sun, 10 Mar 2024 07:46:13 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E8=A7=A3=E7=AE=97?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/GnssCalcDataController.java    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java
index 2b0e8825..8a6dc001 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssCalcDataController.java
@@ -1,7 +1,6 @@
 package com.imdroid.beidou.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.imdroid.beidou.entity.Tenant;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -51,12 +49,6 @@ public class GnssCalcDataController extends BasicController implements CommonExc
             isJoinQuery = searchParams.contains("parentid");
         }
         else isJoinQuery = false;
-        QueryWrapper<GnssCalcData> queryWrapper = new QueryWrapper<>();
-        queryWrapper.last("limit "+limit);
-        queryWrapper.orderByDesc("createtime");
-        logger.info("gnss calc data query begin... ");
-        List<GnssCalcData> gnssCalcDataList = dataMapper.selectList(queryWrapper);
-        logger.info("gnss calc data query done with count={}",gnssCalcDataList.size());
         logger.info("gnss calc data query begin...join={} ",isJoinQuery);
         JSONObject result = this.pageList(session, page, limit, searchParams);
         logger.info("gnss calc data query done.");
@@ -99,10 +91,17 @@ public class GnssCalcDataController extends BasicController implements CommonExc
 
     @Override
     public MPJQueryWrapper<GnssCalcData> prepareQueryWrapper() {
-        return new MPJQueryWrapper<GnssCalcData>()
-                .selectAll(GnssCalcData.class)
-                .leftJoin("gnssdevices d on t.deviceid = d.deviceid")
-                .orderByDesc("t.createtime");
+        if(isJoinQuery) {
+            return new MPJQueryWrapper<GnssCalcData>()
+                    .selectAll(GnssCalcData.class)
+                    .leftJoin("gnssdevices d on t.deviceid = d.deviceid")
+                    .orderByDesc("t.createtime");
+        }
+        else{
+            return new MPJQueryWrapper<GnssCalcData>()
+                    .selectAll(GnssCalcData.class)
+                    .orderByDesc("createtime");
+        }
     }
 
     /**