Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

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

@@ -133,10 +133,10 @@
     </sql>
 
     <sql id="deviceInnerJoins">
-        inner join sms_scene_type t3 on t1.scene_type_id=t3.id
+        inner join sms_scene_type t3 on t1.scene_type_id=t3.id and t3. status = 1
         inner join sms_device_scene t2 on t2.parent_scene_id=t1.id and t2. status = 1
         inner join sms_device t6 on t2.device_id=t6.id and t6. status = 1 and t6.enable_state = 1
-        inner join sms_scene t4 on t2.scene_id=t4.id
+        inner join sms_scene t4 on t2.scene_id=t4.id and t4. status = 1
         inner join sms_scene_type t5 on t4.scene_type_id=t5.id and t5. status = 1
     </sql>