Merge remote-tracking branch 'origin/master'

Lius

2023-10-30 ff9dc3f8220dfeb9acddd2f86c28718001e70314

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

@@ -62,6 +62,18 @@
        <if test="status != null and status != ''">
            and t1.status = #{status}
        </if>
        <if test="equipmentCategoryId != null and equipmentCategoryId != ''">
            and t2.equipment_category_id = #{equipmentCategoryId}
        </if>
        <if test="factoryModelId != null and factoryModelId != ''">
            and t2.factory_model_id = #{factoryModelId}
        </if>
        <if test="specificEquipment != null and specificEquipment != ''">
            and t2.specific_equipment = #{specificEquipment}
        </if>
        <if test="teamId != null and teamId != ''">
            and t1.team_id = #{teamId}
        </if>
        and t1.repair_order_type = #{repairOrderType}
        order by t1.create_time desc
    </select>