From d097d771763e58fe8d1e07573f62153bf1374bbb Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Mon, 18 Nov 2024 08:46:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/ruoyi/web/controller/exam/UserExamController.java | 1 -
.../com/ruoyi/web/controller/manager/UserExamManager.java | 7 +++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java
index 283be66..1d16ec5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java
@@ -86,7 +86,6 @@ public class UserExamController extends BaseController {
@ResponseBody
public TableDataInfo myGrades(UserExamReqDTO reqDTO) {
startPage();
- reqDTO.setUserId(getUserId());
List<UserExamRespDTO> list = userExamManager.selectExamList(reqDTO);
return getDataTable(list);
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserExamManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserExamManager.java
index 6cf1250..1322af5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserExamManager.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/UserExamManager.java
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.manager;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.system.domain.check.TdCheckReport;
import com.ruoyi.system.domain.exam.ExamManagerDTO;
import com.ruoyi.system.domain.paper.dto.request.PaperListReqDTO;
@@ -19,6 +21,8 @@ import java.util.Date;
import java.util.List;
import java.util.Objects;
+import static com.ruoyi.common.utils.ShiroUtils.getUserId;
+
/**
* packageName com.ruoyi.web.controller.manager
*
@@ -49,6 +53,9 @@ public class UserExamManager {
* @return java.util.List<com.hyp.system.domain.SysNotice>
*/
public List<UserExamRespDTO> selectExamList(UserExamReqDTO reqDTO) {
+ if (!SysUser.isAdmin(ShiroUtils.getUserId())){
+ reqDTO.setUserId(getUserId());
+ }
return elUserExamService.selectExamList(reqDTO);
}