|
@@ -49,10 +49,11 @@ public class MercMiniDeviceDataController {
|
|
@ApiOperation("设备销售数据统计总计")
|
|
@ApiOperation("设备销售数据统计总计")
|
|
public R<DeviceDataDto.SumCountVo> sumCount(@RequestBody @Valid DeviceDataDto.SumCountDto dto) {
|
|
public R<DeviceDataDto.SumCountVo> sumCount(@RequestBody @Valid DeviceDataDto.SumCountDto dto) {
|
|
dto.setMercId(MercAuthUtils.getMercId());
|
|
dto.setMercId(MercAuthUtils.getMercId());
|
|
- if (CollUtil.isEmpty(getMercDeviceIds())) {
|
|
|
|
|
|
+ List<Long> mercDeviceIds = getMercDeviceIds();
|
|
|
|
+ if (CollUtil.isEmpty(mercDeviceIds)) {
|
|
return R.ok(new DeviceDataDto.SumCountVo());
|
|
return R.ok(new DeviceDataDto.SumCountVo());
|
|
}
|
|
}
|
|
- dto.setMercDeviceIds(getMercDeviceIds());
|
|
|
|
|
|
+ dto.setMercDeviceIds(mercDeviceIds);
|
|
return R.ok(deviceDataService.sumCount(dto).getData());
|
|
return R.ok(deviceDataService.sumCount(dto).getData());
|
|
}
|
|
}
|
|
|
|
|