Merge remote-tracking branch 'origin/developer' into developer

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

@@ -1088,27 +1088,21 @@
 
 	<select id="queryItemList4RoutePoint" parameterType="long" resultType="map">
 		SELECT
-			pii.id itemId
-			, pii.name
-			, pii.picture_json photo
-			, pii.basis_json basis
-			, pii.check_method method
-			, pii.item_type type
-			, pii.level
-			, pii.risk_desc
-			, pii.input_classify
+			ppi.id itemId,
+			pii.name,
+			pii.picture_json photo,
+			pii.basis_json basis,
+			pii.check_method method,
+			pii.item_type type,
+			pii.level,
+			pii.risk_desc,
+			pii.input_classify
 		FROM
-			p_input_item pii
+			p_point_inputitem ppi
+				LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
 		WHERE
-			pii.id IN (
-				SELECT
-					DISTINCT ppi.input_item_id
-				FROM
-					p_point_inputitem ppi
-				WHERE
-					ppi.point_id = #{pointId}
-					AND ppi.classify_ids = #{classifyId}
-			)
+			ppi.point_id =  #{pointId}
+		  AND ppi.classify_ids = #{classifyId}
 	</select>
 
 	<select id="getPointRefItem" parameterType="list" resultType="map">