|
@@ -159,7 +159,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
CommonSortOrderEnum.validate(monitorTargetPageParam.getSortOrder());
|
|
|
queryWrapper.orderBy(true, monitorTargetPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()), StrUtil.toUnderlineCase(monitorTargetPageParam.getSortField()));
|
|
|
} else {
|
|
|
- queryWrapper.lambda().orderByAsc(MonitorTarget::getStatus).orderByDesc(MonitorTarget::getCreateTime);
|
|
|
+ queryWrapper.lambda().orderByAsc(MonitorTarget::getStatus).orderByAsc(MonitorTarget::getName);
|
|
|
}
|
|
|
queryWrapper.lambda().eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
|
|
|
Page<MonitorTarget> page1 = new Page<>(monitorTargetPageParam.getCurrent(), monitorTargetPageParam.getSize());
|