diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java
index 15ca51918..0f6e8a933 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java
@@ -137,6 +137,11 @@ public class EmisExchangeRateController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody EmisExchangeRate emisExchangeRate)
     {
+        int cnt=emisExchangeRateService.checkUnique(emisExchangeRate);
+        if(cnt>0){
+            return AjaxResult.error("配置重复,请检查时间范围");
+        }
+
         return toAjax(emisExchangeRateService.updateEmisExchangeRate(emisExchangeRate));
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml b/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml
index 4301d8074..146377772 100644
--- a/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml
@@ -43,7 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="checkUnique" parameterType="EmisExchangeRate"  resultType="int">
         select count(1) from emis_exchange_rate
-        where del_flag='0'
+        where
+        del_flag='0'
+        <if test="id != null "> and id != #{id}</if>
         and currency = #{currency}
         and dest_currency = #{destCurrency}
         and (
@@ -51,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             or
             (start_date <![CDATA[ <= ]]>  #{endDate} and #{endDate} <![CDATA[ <= ]]> end_date )
         )
+
 		limit 1
 	</select>