From ffaa6ca7eab630bf64f66e687f835dcd57f39f1a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 04 Jan 2024 09:04:38 +0800
Subject: [PATCH] 查询考核列表异常
---
src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
index ea2ccf8..47a5144 100644
--- a/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
+++ b/src/main/java/org/springblade/modules/assessment/wrapper/AssessmentSetAssessorWrapper.java
@@ -22,6 +22,7 @@
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.assessment.entity.AssessmentScoreEntity;
import org.springblade.modules.assessment.entity.AssessmentSetAssessorEntity;
import org.springblade.modules.assessment.service.IAssessmentScoreService;
import org.springblade.modules.assessment.service.IAssessmentSetService;
@@ -85,10 +86,16 @@
queryWrapper.eq("type", vo.getAssessmentTaskVO().getType());//任务状态是个人还是部门 0：个人1：部门 自己是否评论完成，根据type获取对应的考核结果数量。
queryWrapper.eq("score_user_id", userId);
queryWrapper.eq("assessment_task_id", vo.getAssessmentTaskVO().getId());// 任务id
- AssessmentScoreVO assessmentScoreVO = AssessmentScoreWrapper.build().entityVO(assessmentScoreService.getOne(queryWrapper));
+ AssessmentScoreEntity entity = assessmentScoreService.getOne(queryWrapper);
+ if (null != entity) {
+ AssessmentScoreVO assessmentScoreVO = AssessmentScoreWrapper.build().entityVO(assessmentScoreService.getOne(queryWrapper));
- vo.setIsAssessmentOk(null != assessmentScoreVO);
- vo.setAssessmentScoreVO(assessmentScoreVO);
+ vo.setIsAssessmentOk(null != assessmentScoreVO);
+ vo.setAssessmentScoreVO(assessmentScoreVO);
+ } else {
+ vo.setIsAssessmentOk(false);
+ }
+
}
IPage<AssessmentSetAssessorVO> pageVo = new Page<>(pages.getCurrent(), pages.getSize(), pages.getTotal());
--
Gitblit v1.9.3