|
@@ -71,9 +71,9 @@ public class SensorAlarmServiceImpl extends ServiceImpl<SensorAlarmMapper, Senso
|
|
|
// 创建查询条件
|
|
|
QueryWrapper<SensorAlarm> queryWrapper = new QueryWrapper<SensorAlarm>().checkSqlInjection();
|
|
|
// 获取当前登录用户ID
|
|
|
- String userId = StpLoginUserUtil.getLoginUser().getId();
|
|
|
+ String orgId = StpLoginUserUtil.getLoginUser().getOrgId();
|
|
|
// 查询创建用户为当前用户的记录
|
|
|
- queryWrapper.lambda().eq(SensorAlarm::getCreateUser, userId);
|
|
|
+ queryWrapper.lambda().eq(SensorAlarm::getCreateOrg, orgId);
|
|
|
// 如果有关键词,进行模糊查询或者设备名等字段的精确查询
|
|
|
if (ObjectUtil.isNotEmpty(messagePageParam.getKeyword())) {
|
|
|
queryWrapper.lambda().and(q -> q.like(SensorAlarm::getMessage, messagePageParam.getKeyword()).or().like(SensorAlarm::getDeviceName, messagePageParam.getKeyword()));
|