|
|
@@ -47,7 +47,7 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
|
|
|
}
|
|
|
PageHelper.startPage(params.getPageNum(), params.getPageSize());
|
|
|
var equipmentInfos = lambdaQuery()
|
|
|
- .eq(isNotNull(params.getEquipmentId()), EquipmentInfo::getEquipmentId, params.getEquipmentId())
|
|
|
+ .eq(isNotNull(params.getEquipmentId()), EquipmentInfo::getEquipmentId, isNotNull(params.getEquipmentId()) ? kymCache.getConnectorId(params.getEquipmentId()).substring(0, 16) : "")
|
|
|
.eq(isNotNull(params.getStationId()), EquipmentInfo::getStationId, params.getStationId())
|
|
|
.eq(isNotNull(params.getStatus()), EquipmentInfo::getNetStatus, params.getStatus())
|
|
|
.list();
|