|
|
|
@ -3,13 +3,13 @@ package com.ruoyi.web.controller.manager;
|
|
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import com.ruoyi.common.utils.ShiroUtils;
|
|
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
|
|
import com.ruoyi.system.domain.qu.ElQu;
|
|
|
|
|
import com.ruoyi.system.domain.userbook.ElUserBook;
|
|
|
|
|
import com.ruoyi.system.domain.userbook.dto.UserBookDTO;
|
|
|
|
|
import com.ruoyi.system.service.ElQuService;
|
|
|
|
|
import com.ruoyi.system.service.ElUserBookService;
|
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
@ -105,7 +105,7 @@ public class UserBookManager {
|
|
|
|
|
|
|
|
|
|
public String findNext(String examId, String quId) {
|
|
|
|
|
Integer sort = 999999;
|
|
|
|
|
if(Objects.nonNull(quId)){
|
|
|
|
|
if(StringUtils.isNotBlank(quId)){
|
|
|
|
|
QueryWrapper<ElUserBook> wrapper = new QueryWrapper<>();
|
|
|
|
|
wrapper.lambda()
|
|
|
|
|
.eq(ElUserBook::getUserId, ShiroUtils.getUserId())
|
|
|
|
|