From d17502e1ce534ac7c6645d22facbfc0e5f74ae45 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 15 Jan 2024 15:03:56 +0800
Subject: [PATCH] 支持多部门
---
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
index 8cff9d1..cbfcb2c 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
@@ -18,12 +18,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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;
import org.springblade.modules.evaluate.entity.EvaluateTaskReferrerEntity;
import org.springblade.modules.evaluate.vo.EvaluateTaskReferrerVO;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
import java.util.*;
@@ -34,6 +35,12 @@
* @since 2024-01-05
*/
public class EvaluateTaskReferrerWrapper extends BaseEntityWrapper<EvaluateTaskReferrerEntity, EvaluateTaskReferrerVO> {
+
+ private static final IUserService userService;
+
+ static {
+ userService = SpringUtil.getBean(IUserService.class);
+ }
public static EvaluateTaskReferrerWrapper build() {
return new EvaluateTaskReferrerWrapper();
@@ -56,10 +63,10 @@
List<Map<String,Object>> maps = new ArrayList<>();
for (EvaluateTaskReferrerEntity po:list) {
Map<String,Object> map = new HashMap<>();
- User user = UserCache.getUser(po.getCreateUser());//投票人
+ User user = userService.getById(po.getCreateUser());//投票人
map.put("userName", user.getName());
- map.put("deptName", SysCache.getDeptName(Long.valueOf(user.getDeptId())));
- map.put("postName", SysCache.getPostName(Long.valueOf(user.getPostId())));
+ map.put("deptName", SysCache.getDeptNames(user.getDeptId()));
+ map.put("postName", SysCache.getPostNames(user.getPostId()));
map.put("remark", po.getRemark());//投票理由
maps.add(map);
}
--
Gitblit v1.9.3