Showing
1 changed file
with
3 additions
and
2 deletions
| @@ -522,7 +522,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM | @@ -522,7 +522,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM | ||
| 522 | List<String> allDevices = new ArrayList<>(); | 522 | List<String> allDevices = new ArrayList<>(); |
| 523 | if(organizationDevices != null && !organizationDevices.isEmpty()){ | 523 | if(organizationDevices != null && !organizationDevices.isEmpty()){ |
| 524 | for (DeviceDTO item : organizationDevices) { | 524 | for (DeviceDTO item : organizationDevices) { |
| 525 | - if(!item.getDeviceProfileId().equals(profileId)){ | 525 | + if(StringUtils.isBlank(item.getDeviceProfileId()) || !item.getDeviceProfileId().equals(profileId)){ |
| 526 | continue; | 526 | continue; |
| 527 | } | 527 | } |
| 528 | DeviceTypeEnum deviceType = item.getDeviceType(); | 528 | DeviceTypeEnum deviceType = item.getDeviceType(); |
| @@ -571,7 +571,8 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM | @@ -571,7 +571,8 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM | ||
| 571 | List<TkDoActionEntity> actions = | 571 | List<TkDoActionEntity> actions = |
| 572 | doActionMapper.selectList( | 572 | doActionMapper.selectList( |
| 573 | new LambdaQueryWrapper<TkDoActionEntity>() | 573 | new LambdaQueryWrapper<TkDoActionEntity>() |
| 574 | - .eq(TkDoActionEntity::getSceneLinkageId, sceneId)); | 574 | + .eq(TkDoActionEntity::getSceneLinkageId, sceneId) |
| 575 | + .eq(TkDoActionEntity::getEntityType, ScopeEnum.ALL)); | ||
| 575 | actions.forEach( | 576 | actions.forEach( |
| 576 | item -> { | 577 | item -> { |
| 577 | if (sceneId.equals(item.getSceneLinkageId())) { | 578 | if (sceneId.equals(item.getSceneLinkageId())) { |