Bläddra i källkod

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

hym 4 år sedan
förälder
incheckning
2aa3aad3fa
1 ändrade filer med 1 tillägg och 1 borttagningar
  1. 1 1
      smart-city-platform/src/main/resources/mapper/WarningLogMapper.xml

+ 1 - 1
smart-city-platform/src/main/resources/mapper/WarningLogMapper.xml

@@ -155,7 +155,7 @@
     left join sc_building sb on(sb.id = sd.building_id)
     left join sc_device_type sdt1 on(sdt1.id = sd.device_type)
     left join sc_device_manufacturer sdm1 on(sdm1.id = sdt1.manufacturer_id)
-    left join sc_grid_management sgm on(sgm.device_id = sil.device_id)
+    left join sc_grid_management sgm on(sgm.device_id = swl.device_id)
     <if test="programItems != null and programItems.size() != 0">left join sc_device_dimension sdd on (sdd.device_id = sd.id and sdd.status = 1)</if>
     where swl.status = 1 and sd.status = 1
     <if test="siteId != null"> and sd.site_id = #{siteId}</if>