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<GnssStatus> prepareQueryWrapper() {
         return new MPJQueryWrapper<GnssStatus>()
                 .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<T, R> {
 
         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;
         }
 		/**
 		 * 初始化表单，要加上，不然刷新部分组件可能会不加载