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 | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 cbfcb2c..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,6 +17,7 @@
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.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -64,14 +65,18 @@
for (EvaluateTaskReferrerEntity po:list) {
Map<String,Object> map = new HashMap<>();
User user = userService.getById(po.getCreateUser());//投票人
- 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);
+ 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