From 220ae255402b6056cb9ab32bd8aed61d6cb38441 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 26 Jun 2024 22:41:51 +0800
Subject: [PATCH] md

---
 emis-biz/src/main/resources/mapper/EmisBaseMapper.xml   | 5 +++++
 emis-biz/src/main/resources/mapper/EmisRegionMapper.xml | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
index 950321ec8..17ef2132e 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
@@ -23,6 +23,11 @@
 
     </resultMap>
 
+    <!--    查询区域名称  -->
+    <select id="selectAreaNameById" parameterType="Long" resultType="string">
+        select a.name from emis_country_area a where a.id = #{id} limit 1
+    </select>
+
     <!--    查询国家名称  -->
     <select id="selectCountryNameByCode" parameterType="String" resultType="string">
         select a.name from emis_country a where a.code = #{code} limit 1
diff --git a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
index 890bec9ff..d9f9ccdef 100644
--- a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
@@ -13,7 +13,7 @@
         <result property="shortName"    column="short_name"    />
         <result property="parentCode"    column="parent_code"    />
         <result property="areaId"    column="area_id"    />
-        <result property="areaName"    column="area_name"    />
+
         <result property="countryCode"    column="country_code"    />
 
         <result property="zipCode"    column="zip_code"    />
@@ -21,6 +21,7 @@
 
 <!--        <result property="countryName"    column="country_name"    />-->
         <association property="countryName"    column="country_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="areaName"    column="area_id" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectAreaNameById"/>
 
     </resultMap>