diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java
index 1a29f28e8..aa26cfca8 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCountryController.java
@@ -11,12 +11,15 @@
 
 package com.xdadan.erp.web.emis;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.emis.domain.EmisSite;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.emis.utils.WaybillHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,7 +37,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.core.page.TableDataInfo;
 import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisCountry;
@@ -71,6 +73,15 @@ public class EmisCountryController extends EmisBaseController
     public TableDataInfo listSimple(EmisCountry emisCountry)
     {
         startPage();
+
+        if(!StringUtils.isEmpty(emisCountry.getCode())){
+            emisCountry.setCode(WaybillHelper.formatQueryValue(emisCountry.getCode()));
+            String[] codeSortList = emisCountry.getCode().split(",");
+            if(codeSortList.length>1){
+                emisCountry.getParams().put("codeSortList", Arrays.asList(codeSortList));
+            }
+        }
+
         List<EmisCountry> list = emisCountryService.selectEmisCountryList(emisCountry);
         return getDataTable(list);
     }
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java
index 48116271f..bc60fc72f 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteController.java
@@ -78,6 +78,7 @@ public class EmisSiteController extends EmisBaseController
     public TableDataInfo listSimple(EmisSite emisSite)
     {
         startPage();
+
         if(!StringUtils.isEmpty(emisSite.getSiteCode())){
             emisSite.setSiteCode(WaybillHelper.formatQueryValue(emisSite.getSiteCode()));
             String[] siteCodeSortList = emisSite.getSiteCode().split(",");
diff --git a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
index 3ada4781d..e4d98fa04 100644
--- a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
@@ -57,7 +57,18 @@
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
         </where>
-        order by order_num desc
+
+        <if test="params.codeSortList != null and params.codeSortList.size >0  ">
+            ORDER BY FIELD
+            <foreach collection="params.codeSortList" item="item" open="(code," separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="params.codeSortList == null ">
+            ORDER BY  order_num desc
+        </if>
+
     </select>
 
     <select id="selectEmisCountryById" parameterType="Integer" resultMap="EmisCountryResult">