diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java index 15c85257..0a1ab1f8 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java @@ -1,9 +1,9 @@ package com.imdroid.beidou.controller; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.query.MPJQueryWrapper; import com.imdroid.beidou.entity.Tenant; import com.imdroid.secapi.dto.*; import org.springframework.beans.factory.annotation.Autowired; @@ -110,8 +110,11 @@ public class IndexController extends BasicController{ @ResponseBody public JSONObject list(HttpSession session, Integer page, Integer limit) { Page pageable = new Page<>(page == null ? 1 : page, limit == null ? 10 : limit); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ne("tenantid",Tenant.SAAS_PROVIDER_ID); + MPJQueryWrapper queryWrapper = new MPJQueryWrapper<>(); + queryWrapper.selectAll(GnssStatus.class) + .leftJoin("gnssdevices d on t.deviceid = d.deviceid") + .ne("d.tenantid",Tenant.SAAS_PROVIDER_ID) + .eq("opmode",GnssDevice.OP_MODE_USE); String query = (String) session.getAttribute("query"); if(query != null){ if(query.equals("offline")){