From 82aa17f77a2dfb28ccfe7c8b22a2c13099575bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 20 Jan 2026 16:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E7=B1=BB=E5=88=AB=EF=BC=88=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E3=80=81=E5=9B=BD=E5=A4=96=EF=BC=89=EF=BC=8C=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java   |  7 +++++++
 .../mobilebroken/admin/pojo/query/BaseAreaQuery.java   |  2 +-
 .../nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java  | 10 ++++++++++
 .../nflg/mobilebroken/repository/entity/TBaseArea.java |  5 +++++
 .../src/main/resources/mapper/TBaseAreaMapper.xml      |  6 ++++--
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java
index d91d1b4c..adbf6938 100644
--- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java
+++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/BaseAreaEditDTO.java
@@ -3,6 +3,7 @@ package com.nflg.mobilebroken.admin.pojo.dto;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  *
@@ -17,4 +18,10 @@ public class BaseAreaEditDTO {
 
     @NotBlank(message = "区域名称不能为空")
     private String areaName;
+
+    /**
+     * 类别（国内、国外），字典id
+     */
+    @NotNull(message = "类别不能为空")
+    private Long categoryId;
 }
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 f0e38401..2ce4892d 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
@@ -15,5 +15,5 @@ public class BaseAreaQuery extends PageBaseQuery {
     /**
      * 状态 状态 0-无效  1-有效
      */
-    private Integer areaState;
+    private Byte areaState;
 }
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java
index 2c768bb9..51974518 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/TBaseAreaVO.java
@@ -79,6 +79,16 @@ public class TBaseAreaVO implements Serializable {
      */
     private LocalDateTime dataModifyTime;
 
+    /**
+     * 类别（国内、国外），字典id
+     */
+    private Long categoryId;
+
+    /**
+     * 类别名称
+     */
+    private String categoryName;
+
     /**
      * 子级列表
      */
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java
index b8fa322c..84721c8b 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/TBaseArea.java
@@ -85,4 +85,9 @@ public class TBaseArea implements Serializable {
      * 是否删除0-否 1-是
      */
     private Integer delIs;
+
+    /**
+     * 类别（国内、国外），字典id
+     */
+    private Long categoryId;
 }
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml
index 087adc6a..732a3b01 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseAreaMapper.xml
@@ -13,9 +13,11 @@
 
     </sql>
     <select id="getList" resultType="com.nflg.mobilebroken.common.pojo.vo.TBaseAreaVO">
-        select  * from t_base_area where del_is=0
+        select a.*,di.name as 'category_name'
+        from t_base_area a where del_is=0
+        left join dictionary_item di on a.category_id=di.id
         <if test="(query.areaCodeOrName==null or query.areaCodeOrName=='') and query.areaState==null ">
-            and  parent_area_row_id=0
+            and a.parent_area_row_id=0
         </if>
           <include refid="whr" />