Merge remote-tracking branch 'origin/master'

liujie

2026-01-29 e2fa57c0ae8661a53d02e3d9f9e3d4b27b8aaf6c

Merge remote-tracking branch 'origin/master'

 ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml

@@ -92,13 +92,8 @@
        group by project_id
        order by create_time desc
        ) result on t1.id = result.project_id
        where t1.deleted = 0 and t1.status =1
        <if test="query.category == 1">
            and t1.status = #{query.category}
        </if>
        <if test="query.category == 2">
            and t1.type = #{query.category}
        </if>
        where t1.deleted = 0

        <if test="query.clientId != null">
            and t1.client_id = #{query.clientId}
        </if>