Merge remote-tracking branch 'origin/master'

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml

@@ -672,6 +672,7 @@
         <foreach collection="mainIds" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
+            and b.point_status != '3'
         <if test="filter != null ">and b.filter = #{filter}</if>
     </select>
     <select id="selectBaseInfoByPointId" parameterType="String" resultType="java.util.Map">

inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml

@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				</foreach>
 			</if>
 		</if>
-		order by d.parent_id, d.order_num
+		order by d.relation_parent_id, d.order_num
 	</select>
     
     <select id="selectAreaListByRoleId" resultType="java.lang.Long">