From 7f66b1ae7b1d6679e732a80762a173f12ed84c33 Mon Sep 17 00:00:00 2001 From: weidong Date: Wed, 30 Apr 2025 15:59:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=9D=9ESAAS?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E5=90=8E=EF=BC=8C=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beidou/controller/IndexController.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) 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 7b11d71f..ffda326d 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 @@ -114,12 +114,23 @@ public class IndexController extends BasicController{ public JSONObject list(HttpSession session, Integer page, Integer limit) { Page pageable = new Page<>(page == null ? 1 : page, limit == null ? 10 : limit); MPJQueryWrapper queryWrapper = new MPJQueryWrapper<>(); - queryWrapper.selectAll(GnssStatus.class) - .select("d.name as name","d.devicetype as devicetype","d.project_id as project_id") - .leftJoin("gnssdevices d on t.deviceid = d.deviceid") - .ne("d.tenantid",Tenant.SAAS_PROVIDER_ID) - .eq("opmode",GnssDevice.OP_MODE_USE) - .orderByDesc("updatetime"); + Integer tenantId = getTenantId(session); + if(tenantId == Tenant.SAAS_PROVIDER_ID) { + queryWrapper.selectAll(GnssStatus.class) + .select("d.name as name", "d.devicetype as devicetype", "d.project_id as project_id") + .leftJoin("gnssdevices d on t.deviceid = d.deviceid") + .ne("d.tenantid", Tenant.SAAS_PROVIDER_ID) + .eq("opmode", GnssDevice.OP_MODE_USE) + .orderByDesc("updatetime"); + } + else{ + queryWrapper.selectAll(GnssStatus.class) + .select("d.name as name", "d.devicetype as devicetype", "d.project_id as project_id") + .leftJoin("gnssdevices d on t.deviceid = d.deviceid") + .eq("d.tenantid", tenantId) + .eq("opmode", GnssDevice.OP_MODE_USE) + .orderByDesc("updatetime"); + } String query = (String) session.getAttribute("query"); if(query != null){