Merge branch 'cherry-pick-3baceeb6' into 'v1.0.1.1_Release'

fix: 场景联动命令下发兼容问题。

See merge request huang/thingsboard3.3.2!152

 package org.thingsboard.server.dao.yunteng.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
+import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDoActionEntity;
-import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.DoActionMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -43,11 +42,11 @@ public class TkDoActionServiceImpl extends AbstractBaseService<DoActionMapper, T
       List<TkDeviceEntity> partDevices = deviceMapper.selectList(new LambdaQueryWrapper<TkDeviceEntity>().in(TkDeviceEntity::getTbDeviceId,t.getDeviceId()));
       List<String> deviceId = new ArrayList<>();
       for(TkDeviceEntity item : partDevices){
-        if(!DeviceTypeEnum.SENSOR.equals(item.getDeviceType())){
-          //网关子设备才需要重写deviceId字段
-          break;
+        if(DeviceTypeEnum.SENSOR.equals(item.getDeviceType())){
+          deviceId.add(item.getGatewayId());
+        }else{
+          deviceId.add(item.getTbDeviceId());
         }
-        deviceId.add(item.getGatewayId());
       }
       t.setDeviceId(deviceId);
       return t;