From 03388da14240d0173cd22c332ba3905b57c2d870 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 25 Dec 2023 17:44:33 +0800
Subject: [PATCH] 解决选出候选人不正确问题
---
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
index 60228ed..f76170d 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetWrapper.java
@@ -70,6 +70,11 @@
assessmentSetVO.setDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
assessmentSetVO.setPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
+ user = UserCache.getUser(assessmentSetVO.getToUserId()); //考核人
+ assessmentSetVO.setToUserName(user.getName());
+ assessmentSetVO.setToDeptName(SysCache.getDeptName(Long.valueOf(user.getDeptId())));
+ assessmentSetVO.setToPostName(SysCache.getPostName(Long.valueOf(user.getPostId())));
+
return assessmentSetVO;
}
@@ -98,15 +103,19 @@
vo.setAssessmentTaskVO(null);
- QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
- setEntityQueryWrapper.eq("score_user_id", vo.getToUserId()); //考核人id
- setEntityQueryWrapper.eq("be_id", vo.getUserId()); //被考核人id
- setEntityQueryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());//考核任务
- List<AssessmentScoreEntity> assessmentScoreEntityList = assessmentScoreService.list(setEntityQueryWrapper);
- if (assessmentScoreEntityList.size() > 0)
- vo.setAssessmentScoreVO(AssessmentScoreWrapper.build().entityVO(assessmentScoreEntityList.get(0)));
- else
- vo.setAssessmentScoreVO(null);
+ if(null != vo.getAssessmentTaskVO()) {
+ QueryWrapper<AssessmentScoreEntity> setEntityQueryWrapper = new QueryWrapper<>();
+ setEntityQueryWrapper.eq("score_user_id", vo.getToUserId()); //考核人id
+ setEntityQueryWrapper.eq("be_id", vo.getUserId()); //被考核人id
+ setEntityQueryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());//考核任务
+ List<AssessmentScoreEntity> assessmentScoreEntityList = assessmentScoreService.list(setEntityQueryWrapper);
+ if (assessmentScoreEntityList.size() > 0)
+ vo.setAssessmentScoreVO(AssessmentScoreWrapper.build().entityVO(assessmentScoreEntityList.get(0)));
+ else
+ vo.setAssessmentScoreVO(null);
+ }
+
+
}
IPage<AssessmentSetVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
pageVo.setRecords(records);
--
Gitblit v1.9.3