#FIX 价格策略取消关联设备

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -316,7 +316,9 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         Long strategyId = dto.getStrategyId();
 
         GoodsDeviceDto.SelectList selectList = new GoodsDeviceDto.SelectList();
-        //selectList.setMercId(mercId).setPriceStrategyId(strategyId);
+        if (strategyId != null) {
+            selectList.setMercId(mercId).setPriceStrategyId(strategyId);
+        }
         List<GoodsDeviceDto.Vo> goodsDevices = R.feignCheckData(goodsDeviceService.list(selectList));
         if (type == 2 && CollUtil.isEmpty(goodsDevices)) {
             //右侧已选的