|
|
@@ -1,6 +1,5 @@
|
|
|
package com.yntravelsky.buss.exam.userexam.controller;
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.yntravelsky.buss.exam.userexam.entity.UserExam;
|
|
|
@@ -8,25 +7,19 @@ import com.yntravelsky.buss.exam.userexam.service.IUserExamService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.shiro.authz.annotation.Logical;
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.aspect.annotation.AutoLog;
|
|
|
import org.jeecg.common.system.base.controller.JeecgController;
|
|
|
-import org.jeecg.common.system.query.QueryGenerator;
|
|
|
-import org.jeecg.modules.system.entity.SysUser;
|
|
|
import org.jeecg.modules.system.service.ISysUserService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.util.Arrays;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @Description: 用户考试
|
|
|
@@ -56,7 +49,7 @@ public class UserExamController extends JeecgController<UserExam, IUserExamServi
|
|
|
* @return
|
|
|
*/
|
|
|
@ApiOperation(value = "用户考试-分页列表查询", notes = "用户考试-分页列表查询")
|
|
|
- @RequiresPermissions("userExam:list")
|
|
|
+ @RequiresPermissions(value = {"userExam:list", "examReview:list"}, logical = Logical.OR)
|
|
|
@GetMapping(value = "/list")
|
|
|
public Result<IPage<UserExam>> queryPageList(UserExam userExam,
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
yangfeng