From 567775c8ef9761b5fe5d04073ca329b7ef30e22d Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Jan 2024 16:00:14 +0800
Subject: [PATCH] 第一轮结果导出
---
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java b/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
index 0805dca..8b32c9c 100644
--- a/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
+++ b/src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
@@ -105,10 +106,10 @@
assessmentScore.setAssessmentTaskId(taskId);
//增加根据登录用户部门筛选
-// boolean isadmin = AuthUtil.isAdmin();
-// if (!isadmin) {
-// assessmentScore.setDeptName();
-// }
+ boolean isadmin = AuthUtil.isAdmin();
+ if (!isadmin) {
+ assessmentScore.setDeptId(AuthUtil.getDeptId());
+ }
IPage<AssessmentScoreEntity> pages = assessmentScoreService.selectAssessmentScoreGroupByBeidPage(Condition.getPage(query), assessmentScore);
--
Gitblit v1.9.3