Merge remote-tracking branch 'origin/master'

cl

2024-02-02 129a317ff36d49fcc096cdd60d066594176e9e0e

 jcdm-main/src/main/resources/mapper/rm/repairRecord/RmRepairRecordMapper.xml

@@ -41,6 +41,18 @@
            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
            <if test="spareField1 != null  and spareField1 != ''"> and spare_field_1 = #{spareField1}</if>
            <if test="spareField2 != null  and spareField2 != ''"> and spare_field_2 = #{spareField2}</if>
            <if test="engineNoList != null and engineNoList.size() > 0">
                and box_code in
                <foreach collection="engineNoList" open="(" close=")" separator="," item="engine">
                    #{engine}
                </foreach>
            </if>
            <if test="engineNoListExcel != null and engineNoListExcel.size() > 0">
                and box_code in
                <foreach collection="engineNoListExcel" open="(" close=")" separator="," item="engine">
                    #{engine}
                </foreach>
            </if>
        </where>
    </select>