From cbe647d008378a6f1f95b2cc39cdc34da7568772 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 15 Jul 2024 10:32:46 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisRegionMapper.xml   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
index 084db211c..7cc95fa98 100644
--- a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
@@ -27,7 +27,7 @@
     </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
+        select id, region_code, region_name, region_name_en, region_type, short_name, parent_code, area_id, send_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>
 
 
@@ -41,6 +41,7 @@
             <if test="regionType != null "> and region_type = #{regionType}</if>
             <if test="shortName != null  and shortName != ''"> and short_name like concat('%', #{shortName}, '%')</if>
             <if test="parentCode != null  and parentCode != ''"> and parent_code=#{parentCode}</if>
+            <if test="sendAreaId != null "> and send_area_id = #{sendAreaId}</if>
             <if test="areaId != null "> and area_id = #{areaId}</if>
             <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
             <if test="countryCode != null  and countryCode != ''"> and country_code=#{countryCode}</if>
@@ -61,12 +62,12 @@
     </select>
 
     <select id="selectEmisRegionById" parameterType="Long" resultMap="EmisRegionResult">
-        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
+        select id, region_code, region_name, region_name_en, region_type, short_name, parent_code, area_id, send_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 a
         where a.id = #{id}
     </select>
 
-    <insert id="insertEmisRegion" parameterType="EmisRegion">
+    <insert id="insertEmisRegion" parameterType="EmisRegion" useGeneratedKeys="true" keyProperty="id">
         insert into emis_region
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
@@ -77,6 +78,7 @@
             <if test="shortName != null and shortName != ''">short_name,</if>
             <if test="parentCode != null and parentCode != ''">parent_code,</if>
             <if test="areaId != null">area_id,</if>
+            <if test="sendAreaId != null">send_area_id,</if>
             <if test="areaName != null and areaName != ''">area_name,</if>
             <if test="countryCode != null and countryCode != ''">country_code,</if>
             <if test="countryName != null and countryName != ''">country_name,</if>
@@ -101,6 +103,7 @@
             <if test="shortName != null and shortName != ''">#{shortName},</if>
             <if test="parentCode != null and parentCode != ''">#{parentCode},</if>
             <if test="areaId != null">#{areaId},</if>
+            <if test="sendAreaId != null">#{sendAreaId},</if>
             <if test="areaName != null and areaName != ''">#{areaName},</if>
             <if test="countryCode != null and countryCode != ''">#{countryCode},</if>
             <if test="countryName != null and countryName != ''">#{countryName},</if>
@@ -127,7 +130,8 @@
             <if test="regionType != null">region_type = #{regionType},</if>
             <if test="shortName != null and shortName != ''">short_name = #{shortName},</if>
             <if test="parentCode != null and parentCode != ''">parent_code = #{parentCode},</if>
-            area_id = #{areaId},
+            <if test="areaId != null">area_id = #{areaId},</if>
+            <if test="sendAreaId != null">send_area_id = #{sendAreaId},</if>
             <if test="areaName != null and areaName != ''">area_name = #{areaName},</if>
             <if test="countryCode != null and countryCode != ''">country_code = #{countryCode},</if>
             <if test="countryName != null and countryName != ''">country_name = #{countryName},</if>