|
@@ -123,7 +123,7 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
|
|
|
CommonSortOrderEnum.validate(monitorDevicePageParam.getSortOrder());
|
|
|
queryWrapper.orderBy(true, monitorDevicePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()), StrUtil.toUnderlineCase(monitorDevicePageParam.getSortField()));
|
|
|
} else {
|
|
|
- queryWrapper.lambda().orderByAsc(MonitorDevice::getSortCode);
|
|
|
+ queryWrapper.lambda().orderByAsc(MonitorDevice::getSortCode, MonitorDevice::getId);
|
|
|
}
|
|
|
queryWrapper.lambda().eq(MonitorDevice::getCreateOrg, loginUser.getOrgId()).eq(MonitorDevice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
|
|
|
Page<MonitorDevice> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
|