From 18bbf2f8fb8ea99b03e81b78391afedc6f2b69d9 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 11 Jan 2024 11:21:03 +0800
Subject: [PATCH] 返回投票理由
---
src/main/java/org/springblade/modules/assessment/controller/AssessmentScoreController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 d6d060d..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;
@@ -103,6 +104,13 @@
// IPage<AssessmentScoreEntity> pages = assessmentScoreService.page(Condition.getPage(query),setEntityQueryWrapper);
assessmentScore.setType(type);
assessmentScore.setAssessmentTaskId(taskId);
+
+ //增加根据登录用户部门筛选
+ boolean isadmin = AuthUtil.isAdmin();
+ if (!isadmin) {
+ assessmentScore.setDeptId(AuthUtil.getDeptId());
+ }
+
IPage<AssessmentScoreEntity> pages = assessmentScoreService.selectAssessmentScoreGroupByBeidPage(Condition.getPage(query), assessmentScore);
return R.data(AssessmentScoreWrapper.build().pageVO(pages));
--
Gitblit v1.9.3