|
@@ -137,7 +137,7 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
|
|
|
LambdaQueryWrapper<BaseAlarm> queryWrapper = Wrappers.lambdaQuery();
|
|
|
queryWrapper
|
|
|
.eq(StringUtils.isNotBlank(baseAlarmListVO.getProductCode()),BaseAlarm::getProductCode,baseAlarmListVO.getProductCode())
|
|
|
- .eq(baseAlarmListVO.getAlarmType() != null,BaseAlarm::getAlarmType,baseAlarmListVO.getAlarmType())
|
|
|
+ .eq(StringUtils.isNotBlank(baseAlarmListVO.getAlarmType()),BaseAlarm::getAlarmType,baseAlarmListVO.getAlarmType())
|
|
|
.between(StringUtils.isNotBlank(baseAlarmListVO.getStartTime()) && StringUtils.isNotBlank(baseAlarmListVO.getEndTime()),BaseAlarm::getAlarmTime,baseAlarmListVO.getStartTime(),baseAlarmListVO.getEndTime())
|
|
|
.orderByDesc(BaseAlarm::getId);
|
|
|
List<BaseAlarm> records = this.list(queryWrapper);
|