|
@@ -120,7 +120,10 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
@Override
|
|
@Override
|
|
public List<MonitorTarget> getListByUser(String userId) {
|
|
public List<MonitorTarget> getListByUser(String userId) {
|
|
LambdaQueryWrapper<MonitorTarget> queryWrapper = new LambdaQueryWrapper<MonitorTarget>();
|
|
LambdaQueryWrapper<MonitorTarget> queryWrapper = new LambdaQueryWrapper<MonitorTarget>();
|
|
- queryWrapper.eq(MonitorTarget::getCreatedBy,userId).orderByDesc(MonitorTarget::getCreatedTime);
|
|
|
|
|
|
+ if (ObjectUtil.isNotNull(userId)) {
|
|
|
|
+ queryWrapper.eq(MonitorTarget::getCreateBy,userId).orderByDesc(MonitorTarget::getCreateTime);
|
|
|
|
+ }
|
|
|
|
+ queryWrapper.orderByDesc(MonitorTarget::getCreateTime);
|
|
List<MonitorTarget> monitorTargetList = list(queryWrapper);
|
|
List<MonitorTarget> monitorTargetList = list(queryWrapper);
|
|
monitorTargetList.forEach(monitorTarget -> {
|
|
monitorTargetList.forEach(monitorTarget -> {
|
|
monitorTarget.setMonitorTargetRegionList(monitorTargetRegionService.getRegionListByTargetId(monitorTarget.getId()));
|
|
monitorTarget.setMonitorTargetRegionList(monitorTargetRegionService.getRegionListByTargetId(monitorTarget.getId()));
|
|
@@ -141,7 +144,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
} else {
|
|
} else {
|
|
queryWrapper.lambda().orderByAsc(MonitorTarget::getId);
|
|
queryWrapper.lambda().orderByAsc(MonitorTarget::getId);
|
|
}
|
|
}
|
|
- queryWrapper.lambda().eq(MonitorTarget::getCreatedBy,monitorTargetPageParam.getUserId());
|
|
|
|
|
|
+ queryWrapper.lambda().eq(MonitorTarget::getCreateBy,monitorTargetPageParam.getUserId());
|
|
Page<MonitorTarget> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
|
|
Page<MonitorTarget> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
|
|
//获取设备区域列表并赋值返回
|
|
//获取设备区域列表并赋值返回
|
|
page.getRecords().forEach(monitorTarget -> {
|
|
page.getRecords().forEach(monitorTarget -> {
|