Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-17 c428cfbdb79fdbb6b61ff10db62426d567e664a8

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

@@ -44,18 +44,19 @@
        <result column="update_user" property="updateUser"/>
    </resultMap>
    <select id="selectAuxiliaryCorrectionHours" resultType="com.yuanchu.mom.dto.AuxiliaryCorrectionHoursDto">
        select data.*
        select A.*
        from (
        select ach.*,name
        FROM auxiliary_correction_hours ach
        left join user on user.id=ach.name_user
        WHERE 1=1
        <if test="ids !=null and ids != ''">
            WHERE name_user in
            and name_user in
            <foreach collection="ids" index="index" open="(" separator="," close=")" item="val">
                #{val}
            </foreach>
        </if>
        ) data
        ) A
        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
            ${ew.customSqlSegment}
        </if>