Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseBuildFacilityServiceImpl.java

@@ -99,6 +99,7 @@ public class BaseBuildFacilityServiceImpl extends AbstractCrudService<BaseBuildF
                 .like(StringUtils.isNotBlank(requestVO.getFacilityName()),BaseBuildFacility::getFacilityName,requestVO.getFacilityName())
                 .eq(StringUtils.isNotBlank(requestVO.getFacilityType()),BaseBuildFacility::getFacilityType,requestVO.getFacilityType())
                 .eq(BaseBuildFacility::getDeleteFlag,0)
+                .eq(BaseBuildFacility::getTenantId,SecurityUtils.getTenantId())
                 .orderByDesc(BaseBuildFacility::getId);
         List<BaseBuildFacility> list1 = this.list(queryWrapper);
         if(CollectionUtils.isNotEmpty(list1)){
@@ -149,6 +150,7 @@ public class BaseBuildFacilityServiceImpl extends AbstractCrudService<BaseBuildF
 
         LambdaQueryWrapper<BaseBuildFacility> query = Wrappers.lambdaQuery();
         query.eq(BaseBuildFacility::getId,requestVO.getBaseBuildFacilityId())
+                .eq(BaseBuildFacility::getTenantId,SecurityUtils.getTenantId())
                 .eq(BaseBuildFacility::getDeleteFlag,0);
         BaseBuildFacility buildFacilityOne = this.getOne(query);
         String relateDeviceId = buildFacilityOne.getDeviceId();