From 29fa518bdafdedb4aa4cde223ceeb0c8ee593988 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 10 Apr 2024 15:38:43 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/EmisCountry.java   |  8 ++++----
 .../src/main/resources/mapper/EmisCountryMapper.xml    | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
index e03a4f6ed..204bc6e88 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisCountry.java
  * @author linfso
- * @date 2024-03-20 11:55:22
+ * @date 2024-04-10 07:21:30
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> 国家 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisCountry
  * @Description 国家
  * @author linfso
- * @date 2024-03-20 11:55:22
+ * @date 2024-04-10 07:21:30
  */
 @Data
 public class EmisCountry extends BaseEntity
@@ -45,8 +45,8 @@ public class EmisCountry extends BaseEntity
     private String telAreaCode;
     /* iso代码 */
     private String isoCode;
-    /* 所属洲id */
-    private Integer continentId;
+    /* 所属洲id列表，逗号隔开 */
+    private String continentId;
     /* 显示顺序 */
     private Integer orderNum;
     /* 二字码 */
diff --git a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
index bae585bca..b0c2051ee 100644
--- a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
@@ -37,7 +37,7 @@
             <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
             <if test="telAreaCode != null  and telAreaCode != ''"> and tel_area_code like concat('%', #{telAreaCode}, '%')</if>
             <if test="isoCode != null  and isoCode != ''"> and iso_code like concat('%', #{isoCode}, '%')</if>
-            <if test="continentId != null "> and continent_id = #{continentId}</if>
+            <if test="continentId != null  and continentId != ''"> and find_in_set(#{continentId},continent_id)</if>
             <if test="orderNum != null "> and order_num = #{orderNum}</if>
             <if test="twoCode != null  and twoCode != ''"> and two_code like concat('%', #{twoCode}, '%')</if>
             <if test="threeCode != null  and threeCode != ''"> and three_code like concat('%', #{threeCode}, '%')</if>
@@ -49,7 +49,7 @@
             <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
         </where>
-        order by order_num desc
+        order by create_time desc
     </select>
 
     <select id="selectEmisCountryById" parameterType="Integer" resultMap="EmisCountryResult">
@@ -67,7 +67,7 @@
             <if test="code != null and code != ''">code,</if>
             <if test="telAreaCode != null and telAreaCode != ''">tel_area_code,</if>
             <if test="isoCode != null and isoCode != ''">iso_code,</if>
-            <if test="continentId != null">continent_id,</if>
+            <if test="continentId != null and continentId != ''">continent_id,</if>
             <if test="orderNum != null">order_num,</if>
             <if test="twoCode != null and twoCode != ''">two_code,</if>
             <if test="threeCode != null and threeCode != ''">three_code,</if>
@@ -86,7 +86,7 @@
             <if test="code != null and code != ''">#{code},</if>
             <if test="telAreaCode != null and telAreaCode != ''">#{telAreaCode},</if>
             <if test="isoCode != null and isoCode != ''">#{isoCode},</if>
-            <if test="continentId != null">#{continentId},</if>
+            <if test="continentId != null and continentId != ''">#{continentId},</if>
             <if test="orderNum != null">#{orderNum},</if>
             <if test="twoCode != null and twoCode != ''">#{twoCode},</if>
             <if test="threeCode != null and threeCode != ''">#{threeCode},</if>
@@ -108,7 +108,7 @@
             <if test="code != null and code != ''">code = #{code},</if>
             <if test="telAreaCode != null and telAreaCode != ''">tel_area_code = #{telAreaCode},</if>
             <if test="isoCode != null and isoCode != ''">iso_code = #{isoCode},</if>
-            <if test="continentId != null">continent_id = #{continentId},</if>
+            <if test="continentId != null and continentId != ''">continent_id = #{continentId},</if>
             <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="twoCode != null and twoCode != ''">two_code = #{twoCode},</if>
             <if test="threeCode != null and threeCode != ''">three_code = #{threeCode},</if>