修复

xieb

2025-01-21 bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21

 src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml

@@ -91,14 +91,14 @@
    </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">
            c.score_val,c.remark,c.type,c.weight
            c.score_val,c.remark,c.type,a.weight
        </if>
        <if test="assessmentScore.type != null and assessmentScore.type == 1">
            d.score_val,d.remark,d.type,d.weight
            d.score_val,d.remark,d.type,a.weight
        </if>
        from yw_assessment_set_assessor a
        LEFT JOIN yw_assessment_set b ON (a.assessment_set_id = b.id)
@@ -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>