李晓鹤 / iot-scheduler · Commits

Commit d552078e9da3efc86a690d1e013d00806b3ef066

Authored by yelan
1 parent 18cccce5

feat: 扩展设备报表查询的设备配置范围

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
@@ -46,7 +46,7 @@ public class CzDeviceReportService { @@ -46,7 +46,7 @@ public class CzDeviceReportService {
46 "LEFT JOIN attribute_kv ak2 ON de.id = ak2.entity_id AND ak2.entity_type = 'DEVICE' AND ak2.attribute_key = 'lastActivityTime'\n" + 46 "LEFT JOIN attribute_kv ak2 ON de.id = ak2.entity_id AND ak2.entity_type = 'DEVICE' AND ak2.attribute_key = 'lastActivityTime'\n" +
47 "LEFT JOIN device_credentials dc ON de.id = dc.device_id\n" + 47 "LEFT JOIN device_credentials dc ON de.id = dc.device_id\n" +
48 "WHERE (de.organization_id = '63934b6f-1e02-4d29-ac14-1a64649e2231' or de.organization_id = '35bcdb94-31ec-4750-9ee9-cc855aa66e17')\n" + 48 "WHERE (de.organization_id = '63934b6f-1e02-4d29-ac14-1a64649e2231' or de.organization_id = '35bcdb94-31ec-4750-9ee9-cc855aa66e17')\n" +
49 - "AND de.device_profile_id = 'b2071bd0-df0b-11f0-9cb8-e3376d1e7978'\n" + 49 + "AND (de.device_profile_id = 'b2071bd0-df0b-11f0-9cb8-e3376d1e7978' or de.device_profile_id = 'b058dfb0-3246-11f1-9cb8-e3376d1e7978')\n" +
50 "union ALL\n" + 50 "union ALL\n" +
51 "SELECT \n" + 51 "SELECT \n" +
52 "dc.credentials_id AS sn,\n" + 52 "dc.credentials_id AS sn,\n" +