From 51d29cbf1a3b0b786764b52b0790cdd801b8c327 Mon Sep 17 00:00:00 2001 From: weidong Date: Wed, 28 Feb 2024 12:04:01 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=9D=9Esass?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=95=86=E8=A7=A3=E7=AE=97=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imdroid/beidou/controller/GnssCalcDataController.java | 4 ++++ .../com/imdroid/beidou/controller/GnssStatusController.java | 2 +- .../java/com/imdroid/beidou/controller/IndexController.java | 2 +- .../java/com/imdroid/beidou/service/CommonExcelService.java | 2 +- .../src/main/resources/templates/page/gnss_data_calc.html | 6 +++--- 5 files changed, 10 insertions(+), 6 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 f0896b52..2f2192c2 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 @@ -94,4 +94,8 @@ public class GnssCalcDataController extends BasicController implements CommonExc return true; } + @Override + public String tenantIdField() { + return "d.tenantid"; + } } diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java index c3817fda..49793be7 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java @@ -103,7 +103,7 @@ public class GnssStatusController extends BasicController implements CommonExcel public MPJQueryWrapper prepareQueryWrapper() { return new MPJQueryWrapper() .selectAll(GnssStatus.class) - .select("d.devicetype as devicetype","d.tenantid as tenantid") + .select("d.devicetype as devicetype") .leftJoin("gnssdevices d on t.deviceid = d.deviceid") .orderByDesc("t.updatetime"); } 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 a675da19..3ced1d6a 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 @@ -80,7 +80,7 @@ public class IndexController extends BasicController{ deviceDeployedNum = gnssDeviceMapper.selectCount(deviceQueryWrapper); statusQueryWrapper = new QueryWrapper<>(); - statusQueryWrapper.ne("tenantid", tenantId); + statusQueryWrapper.eq("tenantid", tenantId); statusQueryWrapper.isNotNull("latitude"); statusQueryWrapper.isNotNull("longitude"); deviceList = statusMapper.selectList(statusQueryWrapper); diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java b/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java index 800709eb..55817f94 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/service/CommonExcelService.java @@ -144,7 +144,7 @@ public interface CommonExcelService { Integer tenantId = (Integer) session.getAttribute(SessionUtils.SESSION_TENANT_ID); if (tenantId != null && tenantId != Tenant.SAAS_PROVIDER_ID) { - queryWrapper.eq("tenantid", tenantId); + queryWrapper.eq(tenantIdField(), tenantId); } // 条件查询 diff --git a/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html b/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html index 88c5443a..5f36c65f 100644 --- a/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html +++ b/sec-beidou/src/main/resources/templates/page/gnss_data_calc.html @@ -100,9 +100,9 @@ ]; if([[${role}]] != "ADMIN" && [[${role}]] != "SUPER_ADMIN" && !([[${role}]] == "MANAGER" && [[${tenant_id}]] == 0)) { - cfg_cols[9].hide = true; - cfg_cols[10].hide = true; - cfg_cols[11].hide = true; + data_cols[9].hide = true; + data_cols[10].hide = true; + data_cols[11].hide = true; } /** * 初始化表单，要加上，不然刷新部分组件可能会不加载