|
@@ -617,7 +617,7 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
|
|
|
List<String> list = new ArrayList<>();
|
|
List<String> list = new ArrayList<>();
|
|
|
if ("".equals(deviceCode) || null == deviceCode) {
|
|
if ("".equals(deviceCode) || null == deviceCode) {
|
|
|
QueryWrapper<EnergyEnvDevice> queryWrapper1 = new QueryWrapper<>();
|
|
QueryWrapper<EnergyEnvDevice> queryWrapper1 = new QueryWrapper<>();
|
|
|
- queryWrapper1.in("farm_id", 26,29);
|
|
|
|
|
|
|
+ queryWrapper1.in("farm_id", 26,29,22);
|
|
|
if ("1".equals(type)) {
|
|
if ("1".equals(type)) {
|
|
|
queryWrapper1.eq("remark", 1);
|
|
queryWrapper1.eq("remark", 1);
|
|
|
} else {
|
|
} else {
|
