Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-05 34a4da1c76088a474278f58759d63783a57757a0

 performance-server/src/main/resources/mapper/AuxiliaryCorrectionHoursMapper.xml

@@ -49,12 +49,13 @@
        select ach.*,name
        FROM auxiliary_correction_hours ach
        left join user on user.id=ach.name_user
        <if test="ids !=null and ids != ''">
        WHERE name_user in(#{ids})
        <!--<if test="ids !=null and ids != ''">
            WHERE name_user in
            <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
                #{val}
            </foreach>
        </if>
        </if>-->
        ) A
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}