From 55b227d4bc75374bca89f413750d236669571a70 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 09:28:29 +0800
Subject: [PATCH] 大屏布局

---
 src/main/resources/mapper/SensorMapper.xml |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/SensorMapper.xml b/src/main/resources/mapper/SensorMapper.xml
index 84e8794..2137105 100644
--- a/src/main/resources/mapper/SensorMapper.xml
+++ b/src/main/resources/mapper/SensorMapper.xml
@@ -85,12 +85,18 @@
 		  select * from sensor sen where sen.id in
 			(
 			   select DISTINCT sensor_id from device_version_sensor dvs
-				 where dvs.device_version_id in (
+				 where dvs.device_version_id
+				 in (
 						select DISTINCT device_version_id from device dev where
 						EXISTS (select * from monitor_point mpt where
 						 mpt.organization_id = #{organizationId,jdbcType=INTEGER} and mpt.id = dev.monitor_point_id
-						)
-				 )
-			) order by sen.id asc
+						 OR EXISTS  (
+						              SELECT * from dictionary_data
+									  where dict_data_key = 'auth_config_super_org' and dict_data_value = #{organizationId,jdbcType=INTEGER}
+									  )
+							    )
+				  )
+			  )
+			 order by sen.id asc
 	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0