diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserBookController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserBookController.java index 9c6376a..f99bf8d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserBookController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserBookController.java @@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.userbook.ElUserBook; import com.ruoyi.system.domain.userbook.dto.UserBookDTO; import com.ruoyi.web.controller.manager.UserBookManager; import io.swagger.annotations.Api; @@ -50,7 +51,7 @@ public class UserBookController extends BaseController { @ResponseBody public TableDataInfo list(UserBookDTO reqDTO) { startPage(); - List list = userBookManager.paging(reqDTO); + List list = userBookManager.paging(reqDTO); return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserBookManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserBookManager.java index 4460b92..eb35ccc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserBookManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserBookManager.java @@ -82,7 +82,7 @@ public class UserBookManager { } - public List paging(UserBookDTO reqDTO) { + public List paging(UserBookDTO reqDTO) { //查询条件 QueryWrapper wrapper = new QueryWrapper<>(); // 查找用户的错题 @@ -93,8 +93,7 @@ public class UserBookManager { if(Objects.nonNull(reqDTO.getExamId())){ wrapper.lambda().eq(ElUserBook::getExamId, reqDTO.getExamId()); } - List list = userBookService.list(wrapper); - return Convert.toList(UserBookDTO.class, list); + return userBookService.list(wrapper); }