修改统计量

sms_water/src/main/resources/mapper/DeviceParmMapper.xml

@@ -78,7 +78,7 @@
                     ,p.parm_type as "parmType"
                     ,b.`NAME` as "attributeName"
         from sms_device  a
-         inner join sms_device_parm p on p.DEVICE_ID=a.id and p.parent_scene_id = #{sceneId} and p.`STATUS`=1
+         inner join sms_device_parm p on p.DEVICE_ID=a.id and (p.parent_scene_id = #{sceneId} or  p.SCENE_ID= #{sceneId})  and p.`STATUS`=1
         inner join sms_device_attribute b on p.ATTRIBUTE_ID=b.id and b.`STATUS`=1
         where a.id=#{id} and p.IS_ARTWORK=1  order by  p.seq is null,p.seq asc
     </select>