From 1dca355eb004bf15df3ef88bc7d290e98e5f6e05 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 15 Jan 2024 15:34:31 +0800
Subject: [PATCH] 1
---
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java | 16 ----------------
src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java | 12 +++++++-----
2 files changed, 7 insertions(+), 21 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..0869423 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskReferrerWrapper.java
@@ -64,11 +64,13 @@
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;
diff --git a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
index bf1e270..9040d26 100644
--- a/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
+++ b/src/main/java/org/springblade/modules/evaluate/wrapper/EvaluateTaskWrapper.java
@@ -118,22 +118,6 @@
if (entities.size() > 0)
vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));
-// QueryWrapper qw = new QueryWrapper();
-// qw.eq("evaluate_task_id", vo.getId());
-// List<EvaluateTaskCategoryEntity> evaluateTaskCategoryEntities = evaluateTaskCategoryService.list(qw);
-// int evaluateCount = evaluateTaskCategoryEntities.stream().mapToInt(EvaluateTaskCategoryEntity::getPeopleNum).sum(); // 计算总数
-//
-// if (vo.getType() == 0) {
-// vo.setIsVote(entities.size() == evaluateCount);
-// if (entities.size() > 0)
-// vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));
-// } else {
-// vo.setIsVote(entities.size() > 0);
-// if (entities.size() > 0)
-// vo.setEvaluateCandidateResultVOS(EvaluateCandidateResultWrapper.build().listVO(entities));
-// }
-
-
}
IPage<EvaluateTaskVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
--
Gitblit v1.9.3