From 34a4a46e889622da977fc039eaef7e9a47731d76 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 15 Jan 2024 10:40:16 +0800
Subject: [PATCH] 员工信息
---
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java
index fa6859c..24301b5 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentScoreWrapper.java
@@ -19,7 +19,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springblade.common.cache.SysCache;
-import org.springblade.common.cache.UserCache;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
@@ -29,6 +28,7 @@
import org.springblade.modules.assessment.service.IAssessmentTaskService;
import org.springblade.modules.assessment.vo.AssessmentScoreVO;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
import java.util.List;
import java.util.Objects;
@@ -46,10 +46,13 @@
private static final IAssessmentScoreService assessmentScoreService;
private static final IAssessmentTaskService assessmentTaskService;
+ private static final IUserService userService;
+
static {
assessmentSetService = SpringUtil.getBean(IAssessmentSetService.class);
assessmentScoreService = SpringUtil.getBean(IAssessmentScoreService.class);
assessmentTaskService = SpringUtil.getBean(IAssessmentTaskService.class);
+ userService = SpringUtil.getBean(IUserService.class);
}
public static AssessmentScoreWrapper build() {
@@ -74,7 +77,7 @@
//开始处理
for (AssessmentScoreVO vo: records) {
if (vo.getType() == 0) {
- User user = UserCache.getUser(vo.getBeId()); //被考核人
+ User user = userService.getById(vo.getBeId()); //被考核人
vo.setUserName(user.getName());
vo.setCode(user.getCode());
vo.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
@@ -84,7 +87,7 @@
vo.setDeptName(SysCache.getDeptName(Long.valueOf(vo.getBeId())));
}
- User scoreUser = UserCache.getUser(vo.getScoreUserId()); //考核人
+ User scoreUser = userService.getById(vo.getScoreUserId()); //考核人
vo.setScoreUserName(scoreUser.getName());
vo.setScoreDeptName(SysCache.getDeptName(Long.valueOf(scoreUser.getDeptId())));
vo.setScorePostName(SysCache.getPostName(Long.valueOf(scoreUser.getPostId())));
--
Gitblit v1.9.3