From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复
---
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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..5e53bd4 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
@@ -17,13 +17,15 @@
package org.springblade.modules.evaluate.wrapper;
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;
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 +36,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,15 +64,19 @@
List<Map<String,Object>> maps = new ArrayList<>();
for (EvaluateTaskReferrerEntity po:list) {
Map<String,Object> map = new HashMap<>();
- User user = UserCache.getUser(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("remark", po.getRemark());//投票理由
- maps.add(map);
+ User user = userService.getById(po.getCreateUser());//投票人
+ if (null != user) {
+ map.put("userName", user.getName());
+ map.put("deptName", SysCache.getDeptNames(user.getDeptId()));
+ map.put("postName", SysCache.getPostNames(user.getPostId()));
+ map.put("remark", po.getRemark());//投票理由
+ maps.add(map);
+ }
}
- return maps;
+ IPage<Map<String,Object>> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
+ pageVo.setRecords(maps);
+ return pageVo;
}
--
Gitblit v1.9.3