Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

2026-03-06 b7eb6e87b4d88e5a419b64e3e3d0e5dc1be0f48f

 src/main/resources/mapper/equipmentenergyconsumption/electricityConsumptionAreaMapper.xml

@@ -6,12 +6,18 @@
    <select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea">
        select * from electricity_consumption_area
        <where>
            <if test="electricityConsumptionArea.id != null">
                id = #{electricityConsumptionArea.id}
            </if>
            <if test="electricityConsumptionArea.areaName != null and electricityConsumptionArea.areaName != ''">
                area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
                and area_name like CONCAT('%', #{electricityConsumptionArea.areaName}, '%')
            </if>
            <if test="electricityConsumptionArea.areaType != null and electricityConsumptionArea.areaType != ''">
                and area_type like CONCAT('%', #{electricityConsumptionArea.areaType}, '%')
            </if>
            <if test="electricityConsumptionArea.sort != null">
                and sort = #{electricityConsumptionArea.sort}
            </if>
            <if test="electricityConsumptionArea.fuId != null">
                and fu_id = #{electricityConsumptionArea.fuId}
            </if>