巡检bug

amos-boot-system-equip/src/main/resources/mapper/FormInstanceMapper.xml

@@ -102,7 +102,7 @@
         a.group_code AS groupCode,
         a.group_type AS groupType,
         wlss.scene_id as sceneId,
-        MAX( CASE WHEN a.field_name = 'parentId' THEN a.field_value END ) AS parentId,
+        IFNULL(MAX( CASE WHEN a.field_name = 'parentId' THEN a.field_value END ), '') AS parentId,
         MAX( CASE WHEN a.field_name = 'name' THEN a.field_value END ) AS instanceName,
         MAX( CASE WHEN a.field_name = 'name' THEN a.field_value END ) AS name,
         MAX( CASE WHEN a.field_name = 'code' THEN a.field_value END ) AS code,

amos-boot-system-patrol/src/main/resources/db/mapper/pointMapper.xml

@@ -324,7 +324,7 @@
     <select id="getPointById" resultType="Map">
 		SELECT
 			p.id,
-			P.route_name routeName,
+			p.route_name routeName,
 			p.point_no pointNo,
 			p.NAME pointName,
 			(CASE p.is_fixed
@@ -335,7 +335,7 @@
 			END) fixed,
 		  p.charge_person_id userName,
 			p.charge_dept_id depid,
-		    p.risk_source_id buildingId,
+		    IFNULL(p.risk_source_id, '') as buildingId,
 			p.remark,
 			p.offline
 		FROM