|
@@ -98,7 +98,7 @@ public class SensorAlarmServiceImpl extends ServiceImpl<SensorAlarmMapper, Senso
|
|
|
// 查询创建用户为当前用户的记录
|
|
|
queryWrapper.lambda().eq(SensorAlarm::getCreateOrg, orgId);
|
|
|
final String type = messagePageParam.getType();
|
|
|
- if(StrUtil.isNotBlank(type) || type.trim().equalsIgnoreCase("system")){
|
|
|
+ if(StrUtil.isNotBlank(type) && type.trim().equalsIgnoreCase("system")){
|
|
|
queryWrapper.lambda().eq(SensorAlarm::getType, SensorAlarmType.SENSOR_OFFLINE.getDeviceCode());
|
|
|
}else{
|
|
|
queryWrapper.lambda().eq(SensorAlarm::getType, SensorAlarmType.DATA_ALARM.getDeviceCode());
|