|
@@ -15,13 +15,12 @@ package vip.xiaonuo.disk.service.impl;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.collection.CollStreamUtil;
|
|
import cn.hutool.core.collection.CollStreamUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
-import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
-import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
|
|
|
|
|
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
|
import vip.xiaonuo.disk.domain.CourseStudentBurialpoint;
|
|
import vip.xiaonuo.disk.domain.CourseStudentBurialpoint;
|
|
@@ -48,13 +47,8 @@ public class CourseStudentBurialpointServiceImpl extends ServiceImpl<CourseStude
|
|
|
@Override
|
|
@Override
|
|
|
public Page<CourseStudentBurialpoint> page(CourseStudentProgressPageParam courseStudentProgressPageParam) {
|
|
public Page<CourseStudentBurialpoint> page(CourseStudentProgressPageParam courseStudentProgressPageParam) {
|
|
|
QueryWrapper<CourseStudentBurialpoint> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<CourseStudentBurialpoint> queryWrapper = new QueryWrapper<>();
|
|
|
- if(ObjectUtil.isAllNotEmpty(courseStudentProgressPageParam.getSortField(), courseStudentProgressPageParam.getSortOrder())) {
|
|
|
|
|
- CommonSortOrderEnum.validate(courseStudentProgressPageParam.getSortOrder());
|
|
|
|
|
- queryWrapper.orderBy(true, courseStudentProgressPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
|
|
|
|
|
- StrUtil.toUnderlineCase(courseStudentProgressPageParam.getSortField()));
|
|
|
|
|
- } else {
|
|
|
|
|
- queryWrapper.lambda().orderByAsc(CourseStudentBurialpoint::getId);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ queryWrapper.lambda().eq(CourseStudentBurialpoint::getCreateUser, StpLoginUserUtil.getLoginUser().getId());
|
|
|
|
|
+ queryWrapper.lambda().orderByDesc(CourseStudentBurialpoint::getCreateTime);
|
|
|
return this.page(CommonPageRequest.defaultPage(), queryWrapper);
|
|
return this.page(CommonPageRequest.defaultPage(), queryWrapper);
|
|
|
}
|
|
}
|
|
|
|
|
|