diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java
index ee5a037c8..e10754ec5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java
@@ -59,4 +59,6 @@ public class EmisTransProduct extends BaseEntity
/* 最大时效 */
private Integer maxAging;
+ private String countryName;
+
}
diff --git a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
index 08cdf219e..74439ef82 100644
--- a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
@@ -67,8 +67,8 @@
and dest_name like concat('%', #{destName}, '%')
and dest_name_en like concat('%', #{destNameEn}, '%')
and status = #{status}
- and line_code like concat('%', #{lineCode}, '%')
- and country like concat('%', #{country}, '%')
+ and line_code=#{lineCode}
+ and country=#{country}
and site_code like concat('%', #{siteCode}, '%')
and province like concat('%', #{province}, '%')
and city like concat('%', #{city}, '%')
diff --git a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
index 9bd9fe061..977872cff 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
@@ -12,7 +12,6 @@
-
@@ -25,12 +24,24 @@
+
+
+
+
select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, min_aging, max_aging, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_trans_product
+
+
+
+