diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java
index 3dd729b8..bdc9d875 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java
@@ -61,10 +61,10 @@ public interface BmUnitMapper
 
     /**
      * 根据单位名查询单位信息
-     * @param unitName
+     * @param bmUnit
      * @return
      */
-    BmUnit selectBmUnitByProName(String unitName);
+    BmUnit selectBmUnitByProName(BmUnit bmUnit);
 
     /**
      * 根据单位id查询单位人员数量
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java
index 61021146..ea664063 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java
@@ -126,7 +126,7 @@ public class BmUnitServiceImpl implements IBmUnitService
     public AjaxResult insertBmUnit(BmUnit bmUnit)
     {
         //根据单位名称查询去重
-        BmUnit unit = bmUnitMapper.selectBmUnitByProName(bmUnit.getUnitName());
+        BmUnit unit = bmUnitMapper.selectBmUnitByProName(bmUnit);
         if (unit != null) {
             return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg());
         }
@@ -157,7 +157,7 @@ public class BmUnitServiceImpl implements IBmUnitService
     public AjaxResult updateBmUnit(BmUnit bmUnit)
     {
         //根据单位名称查询去重
-        BmUnit unit = bmUnitMapper.selectBmUnitByProName(bmUnit.getUnitName());
+        BmUnit unit = bmUnitMapper.selectBmUnitByProName(bmUnit);
         if (unit != null) {
             if (!Objects.equals(unit.getUnitId(), bmUnit.getUnitId())) {
                 return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg());
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
index 92a411d7..b3af0647 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
@@ -40,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectBmUnitByProName" resultType="com.bonus.material.basic.domain.BmUnit">
         select unit_id as unitId, unit_name as unitName from bm_unit where del_flag = 0 and unit_name = #{unitName}
+        <if test="deptId != null">and dept_id = #{deptId}</if>
+        <if test="typeId != null">and type_id = #{typeId}</if>
     </select>
 
     <select id="countBmUnitPersonByUnitId" resultType="java.lang.Integer">