修改三维消息查询脚本

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -1256,7 +1256,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				r.name as label,
-				'' as protectObjName,
+				r.name as protectObjName,
 				'' as routeName,
 				'' as person,
 				r.rpn as title,
@@ -1291,7 +1291,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				p.name as label,
-				'' as protectObjName,
+				p.name as protectObjName,
 				p.route_name as routeName,
 				p.charge_person_id as person,
 				case 
@@ -1327,7 +1327,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				e.name as label,
-				'' as protectObjName,
+				e.name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1357,7 +1357,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				m.name as label,
-				group_concat(f.name) as protectObjName,
+				IFNULL(group_concat(f.name),'') as protectObjName,
 				'' as routeName,
 				'' as person,
 				m.name as title,
@@ -1428,7 +1428,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1458,7 +1458,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1488,7 +1488,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1518,7 +1518,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1548,7 +1548,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
@@ -1578,14 +1578,14 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 					)
 				END positionDTO,
 				name as label,
-				'' as protectObjName,
+				name as protectObjName,
 				'' as routeName,
 				'' as person,
 				name as title,
 				concat('fireFoamRoom-',id) as `key`
 			from f_fire_station where type = 1
 		) as tmp
-		where 1=1
+		<where>
 			<if test="inputText!=null" >
 	            AND (
 	            tmp.code LIKE '%${inputText}%'
@@ -1598,6 +1598,7 @@ from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue
 			<if test="orgCode!=null">
 				AND (tmp.orgCode = #{orgCode} OR tmp.orgCode like CONCAT(#{orgCode},'-%') )
 			</if>
+		</where>
 		LIMIT ${start},${length}
 	</select>
 	<select id="getAllPointInRegions" resultType="java.util.Map">