|
|
@@ -48,13 +48,7 @@ public class ResourceUserfileConvertServiceImpl extends ServiceImpl<ResourceUser
|
|
|
@Override
|
|
|
public Page<ResourceUserfileConvert> page(ResourceUserfileConvertPageParam resourceUserfileConvertPageParam) {
|
|
|
QueryWrapper<ResourceUserfileConvert> queryWrapper = new QueryWrapper<>();
|
|
|
- if(ObjectUtil.isAllNotEmpty(resourceUserfileConvertPageParam.getSortField(), resourceUserfileConvertPageParam.getSortOrder())) {
|
|
|
- CommonSortOrderEnum.validate(resourceUserfileConvertPageParam.getSortOrder());
|
|
|
- queryWrapper.orderBy(true, resourceUserfileConvertPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
|
|
|
- StrUtil.toUnderlineCase(resourceUserfileConvertPageParam.getSortField()));
|
|
|
- } else {
|
|
|
- queryWrapper.lambda().orderByAsc(ResourceUserfileConvert::getId);
|
|
|
- }
|
|
|
+ queryWrapper.lambda().orderByDesc(ResourceUserfileConvert::getCreateTime);
|
|
|
queryWrapper.lambda().like(resourceUserfileConvertPageParam.getFileName() != null,ResourceUserfileConvert::getFileName, resourceUserfileConvertPageParam.getFileName());
|
|
|
queryWrapper.lambda().eq(ResourceUserfileConvert::getUserId, StpLoginUserUtil.getLoginUser().getId());
|
|
|
return this.page(CommonPageRequest.defaultPage(), queryWrapper);
|