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<GnssStatus> 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){