Merge remote-tracking branch 'origin/master'

zhangherong

2025-05-07 e4bc8d8c824b9cbe38f87a136d25e70ce34b7eff

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml

@@ -14,7 +14,7 @@
                <when test="equipmentIds != null and equipmentIds.size() > 0 ">
                    AND t2.equipment_code IN
                    <foreach collection="equipmentIds" item="equipmentId" index="index" open="(" close=")" separator=",">
                        {equipmentId}
                        #{equipmentId}
                    </foreach>
                </when>
                <otherwise>
@@ -39,7 +39,10 @@
            <if test="eamRepairOrder.repairCode != null and eamRepairOrder.repairCode != ''">
                AND t1.repair_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.repairCode }),'%')
            </if>
            <if test="eamRepairOrder.sparePartDescription != null and eamRepairOrder.sparePartDescription != ''">
                AND t1.spare_part_description LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.sparePartDescription }),'%')
            </if>
        </where>
        ORDER BY t1.create_time
        ORDER BY t1.create_time DESC
    </select>
</mapper>