diff --git a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
index c6228a2..3022f2f 100644
--- a/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
+++ b/data-center-business-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
@@ -471,7 +471,7 @@
         from
         	device_info
         left join type on device_info.type_id = type.id
-        where device_info.flag = 0
+        where device_info.flag = 0 AND device_info.company_id = #{companyId}
         <if test="deviceIdList != null">
             AND device_info.device_id IN
             <foreach item="item" collection="deviceIdList" open="(" separator="," close=")">
diff --git a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/CommonServiceImpl.java b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/CommonServiceImpl.java
index 34301e9..09cf740 100644
--- a/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/CommonServiceImpl.java
+++ b/data-center-business-service/src/main/java/com/techsor/datacenter/business/service/impl/CommonServiceImpl.java
@@ -1434,6 +1434,10 @@ public class CommonServiceImpl implements CommonService {
 				return SimpleDataResponse.fail(ResponseCode.MSG_ERROR, "Apikey is invalid", new ArrayList<>());
 			}
 
+			Map<String, Object> companySearchMap = new HashMap<>();
+			companySearchMap.put("apikey", apikey);
+			ApikeyInfo2 selfCompanyInfo = basicCompanyMapperExt.getAuroraInfoByApikey(companySearchMap);
+
 			DataSourceContextHolder.clearCurrentDataSourceKey();
 			DataSourceContextHolder.setCurrentDataSourceKey(Constants.DATASOURCE_PREFIX+ apikeyInfo.getId());
 
@@ -1473,6 +1477,7 @@ public class CommonServiceImpl implements CommonService {
 			if (deviceIdList.size() > 0) {
 				Map<String, Object> paramMap = new HashMap<>();
 				paramMap.put("deviceIdList", deviceIdList);
+				paramMap.put("companyId", selfCompanyInfo.getId());
 				dpfDeviceInfoVOs = deviceInfoMapperExt.getRiliDeviceInfo(paramMap);
 				
 				// Retrieve the set of DeviceId from DeviceInfoVOs