Commit aaa7934c authored by Carit Zhu's avatar Carit Zhu 🎱

Add initialValue negative judgement for AlarmLogService.

parent 0038bb64
Pipeline #445 passed with stage
in 0 seconds
...@@ -59,7 +59,7 @@ public class AlarmLogService { ...@@ -59,7 +59,7 @@ public class AlarmLogService {
} }
public List<ResultAlarmLogVo> getAlarm(AlarmTermVo alarmTermVo,Integer initialValue,Integer rows){ public List<ResultAlarmLogVo> getAlarm(AlarmTermVo alarmTermVo,Integer initialValue,Integer rows){
return alarmLogMapper.getAlarm(alarmTermVo,initialValue,rows); return alarmLogMapper.getAlarm(alarmTermVo, initialValue < 0 ? 0 : initialValue, rows);
} }
public Integer getAlarmWarehouseForCount(WarehouseAlarmTermVo warehouseAlarmTermVo){ public Integer getAlarmWarehouseForCount(WarehouseAlarmTermVo warehouseAlarmTermVo){
...@@ -67,7 +67,7 @@ public class AlarmLogService { ...@@ -67,7 +67,7 @@ public class AlarmLogService {
} }
public List<ResultWarehouseAlarmLogVo> getAlarmWarehouse(WarehouseAlarmTermVo warehouseAlarmTermVo,Integer initialValue,Integer rows){ public List<ResultWarehouseAlarmLogVo> getAlarmWarehouse(WarehouseAlarmTermVo warehouseAlarmTermVo,Integer initialValue,Integer rows){
return alarmLogMapper.getAlarmWarehouse(warehouseAlarmTermVo,initialValue,rows); return alarmLogMapper.getAlarmWarehouse(warehouseAlarmTermVo, initialValue < 0 ? 0 : initialValue, rows);
} }
public List<AlarmLogVo> getRealTimeAlarm(String companyNo){ public List<AlarmLogVo> getRealTimeAlarm(String companyNo){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment