From 1a7eaabc9ffdfb14eca76dcaff83795c87669910 Mon Sep 17 00:00:00 2001
From: WangGuangYuan <wgy_2020@163.com>
Date: Mon, 23 Mar 2026 14:01:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=BD=92=E6=A1=A3=E6=8E=92=E9=99=A4?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E7=8A=B6=E6=80=81=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=88=97=E8=A1=A8=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/task/PatrolResultMapper.xml       | 1 +
 .../src/main/resources/mapper/area/BaseDataAreaMapper.xml       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
index 852faac..b102f53 100644
--- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml
+++ b/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">
diff --git a/inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml b/inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml
index 772c7e8..e7d2f4f 100644
--- a/inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml
+++ b/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">