/gis/device/getDeviceLogCurves电量和水量折线图数据

fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/ProductMapper.xml

@@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="!showSenior and tenantId != null  and tenantId != 0 and !isAdmin">
                 and p.tenant_id = #{tenantId}
             </if>
+            <if test="productId != null  and productId != ''"> and p.product_id = #{productId}</if>
             <if test="productName != null  and productName != ''"> and p.product_name like concat('%', #{productName}, '%')</if>
             <if test="categoryName != null  and categoryName != ''"> and p.category_name like concat('%', #{categoryName}, '%')</if>
             <if test="status != null "> and p.status = #{status}</if>

fastbee-service/fastbee-waterele-service/src/main/resources/mapper/waterele/MaWatereleRecordMapper.xml

@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areacode != null  and areacode != ''"> and areaCode = #{areacode}</if>
             <if test="action != null  and action != ''"> and action = #{action}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectMaWatereleRecordById" parameterType="Long" resultMap="MaWatereleRecordResult">