From f1fc52d7c28a995d1313f8de1f7aabe90c589ab7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 19 Apr 2024 18:37:18 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisRegionMapper.xml     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
index 4cf9bf1a1..151ffac21 100644
--- a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
@@ -15,7 +15,7 @@
         <result property="areaId"    column="area_id"    />
         <result property="areaName"    column="area_name"    />
         <result property="countryCode"    column="country_code"    />
-        <result property="countryName"    column="country_name"    />
+
         <result property="zipCode"    column="zip_code"    />
         <result property="orderNum"    column="order_num"    />
         <result property="remark"    column="remark"    />
@@ -27,12 +27,20 @@
         <result property="updateTime"    column="update_time"    />
         <result property="createSite"    column="create_site"    />
         <result property="updateSite"    column="update_site"    />
+
+<!--        <result property="countryName"    column="country_name"    />-->
+        <association property="countryName"    column="country_code" select="selectCountryNameByCode"/>
+
     </resultMap>
 
     <sql id="selectEmisRegionVo">
         select id, region_code, region_name, region_name_en, region_type, short_name, parent_code, area_id, area_name, country_code, country_name, zip_code, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_region
     </sql>
 
+    <select id="selectCountryNameByCode" parameterType="String" resultType="string">
+        select a.name from emis_country a where a.code = #{code} limit 1
+    </select>
+
     <select id="selectEmisRegionList" parameterType="EmisRegion" resultMap="EmisRegionResult">
         <include refid="selectEmisRegionVo"/>
         <where>