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/assessment/mapper/AssessmentScoreMapper.xml | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
index ab76377..4d980eb 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
@@ -91,7 +91,7 @@
</select>
<select id="selectAssessmentScoreInfoV2Page" resultMap="assessmentScoreResultInfoMap">
- select a.user_name as scoreUserName,a.dept_name as scoreDeptName,a.post_name as scorePostName,
+ select c.id,a.user_name as scoreUserName,a.dept_name as scoreDeptName,a.post_name as scorePostName,
b.user_name,b.dept_name ,b.post_name,
<if test="assessmentScore.type != null and assessmentScore.type == 0">
@@ -126,11 +126,8 @@
<if test="assessmentScore.scoreUserName != null and assessmentScore.scoreUserName != ''">
and a.user_name like concat('%', #{assessmentScore.scoreUserName}, '%')
</if>
- <if test="assessmentScore.deptName != null and assessmentScore.deptName != '' and assessmentScore.type != null and assessmentScore.type == 1">
- and d.dept_name like concat('%', #{assessmentScore.deptName}, '%')
- </if>
- <if test="assessmentScore.deptName != null and assessmentScore.deptName != '' and assessmentScore.type != null and assessmentScore.type == 0">
- and c.dept_name like concat('%', #{assessmentScore.deptName}, '%')
+ <if test="assessmentScore.deptName != null and assessmentScore.deptName != ''">
+ and b.dept_name like concat('%', #{assessmentScore.deptName}, '%')
</if>
</where>
</select>
--
Gitblit v1.9.3