Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-22 2c743103cfa6e24bcb3fd064845c8cfd8fe8bbe6

 screen-api/src/main/resources/mapper/DeviceMapper.xml

@@ -43,4 +43,23 @@
        AND `time` <![CDATA[<]]> #{end}
        ORDER BY `time`
    </select>
    <select id="deviceList" resultMap="BaseResultMap">
        SELECT
            t.latitude,
            t.longitude,
            t.mac,
            t.state
        FROM
            device t
                inner JOIN monitor_point p on p.id = t.monitor_point_id and p.is_delete = 0
                and p.organization_id in (
                    SELECT t1.id FROM organization t1
                    where t1.id = #{organizationId} or t1.parent_id = #{organizationId})
        <if test="region != null">
            and ${region} = #{regionCode}
        </if>
        WHERE
            t.state <![CDATA[ <> ]]> '0'  and t.is_delete = 0
        order by t.id desc
    </select>
</mapper>