From a7487dcafa7b9b7455d1f5dcd90d6657bd05b101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 6 Feb 2025 17:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/mobilebroken/admin/pojo/query/BaseAreaQuery.java   | 5 +++++
 .../src/main/resources/mapper/TBaseAreaMapper.xml           | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/BaseAreaQuery.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/BaseAreaQuery.java
index eb8560e2..f0e38401 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/BaseAreaQuery.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/BaseAreaQuery.java
@@ -11,4 +11,9 @@ public class BaseAreaQuery extends PageBaseQuery {
      * 区域编码or 名称
      */
     private String areaCodeOrName;
+
+    /**
+     * 状态 状态 0-无效  1-有效
+     */
+    private Integer areaState;
 }
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml
index 71c4db8d..96401a1c 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml
@@ -6,13 +6,11 @@
         <if test="query.areaCodeOrName!=null and query.areaCodeOrName!=''">
             and  (area_code =#{query.areaCodeOrName} or area_name = #{query.areaCodeOrName} )
         </if>
-        <if test="query.areaState!=null and query.areaState!=''">
-            and area_state=#{query.areaState}
-        </if>
+
 
     </sql>
     <select id="getList" resultType="com.nflg.mobilebroken.common.pojo.vo.TBaseAreaVO">
-        select  * from t_base_area where 1=1
+        select  * from t_base_area where area_state=1
         <if test="query.areaCodeOrName==null or query.areaCodeOrName==''">
             and  parent_area_row_id=0
         </if>