diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyStoreController.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyStoreController.java
index be55e95..cd9386d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyStoreController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyStoreController.java
@@ -119,6 +119,10 @@ public class CompanyStoreController extends BaseController
         {
             return error("新增失败，门店编号'" + companyStore.getStoreNumber() + "'已存在");
         }
+        if (CompanyStore.NOT_UNIQUE.equals(companyStoreService.checkStoreNameUnique(companyStore)))
+        {
+            return error("新增失败，门店名称'" + companyStore.getName() + "'已存在");
+        }
         companyStore.setCreateBy(getLoginName());
         int flag = companyStoreService.insertCompanyStore(companyStore);
         if(flag > 0){
@@ -158,6 +162,10 @@ public class CompanyStoreController extends BaseController
         {
             return error("修改失败，门店编号'" + companyStore.getStoreNumber() + "'已存在");
         }
+        if (CompanyStore.NOT_UNIQUE.equals(companyStoreService.checkStoreNameUnique(companyStore)))
+        {
+            return error("修改失败，门店名称'" + companyStore.getName() + "'已存在");
+        }
         companyStore.setUpdateBy(getLoginName());
         int flag = companyStoreService.updateCompanyStore(companyStore);
         if(flag > 0){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/mapper/CompanyStoreMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/mapper/CompanyStoreMapper.java
index d493be9..b6b7742 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/operation/mapper/CompanyStoreMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/mapper/CompanyStoreMapper.java
@@ -26,6 +26,7 @@ public interface CompanyStoreMapper
      * @return 门店信息
      */
     public CompanyStore checkStoreNoUnique(String storeNo);
+    public CompanyStore checkStoreNameUnique(String name);
 
     /**
      * 查询门店列表
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/ICompanyStoreService.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/ICompanyStoreService.java
index be161d3..107a0bb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/ICompanyStoreService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/ICompanyStoreService.java
@@ -34,6 +34,7 @@ public interface ICompanyStoreService
      */
     public String checkStoreNoUnique(CompanyStore companyStore);
 
+    public String checkStoreNameUnique(CompanyStore companyStore);
     /**
      * 新增门店
      * 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java
index 09bdba4..440c6fa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java
@@ -73,7 +73,16 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService
         }
         return CompanyStore.UNIQUE;
     }
-
+    @Override
+    public String checkStoreNameUnique(CompanyStore companyStore) {
+        Long storeId = StringUtils.isNull(companyStore.getId()) ? -1L : companyStore.getId();
+        CompanyStore info = companyStoreMapper.checkStoreNameUnique(companyStore.getName());
+        if (StringUtils.isNotNull(info) && info.getId().longValue() != storeId.longValue())
+        {
+            return CompanyStore.NOT_UNIQUE;
+        }
+        return CompanyStore.UNIQUE;
+    }
     /**
      * 新增门店
      * 
diff --git a/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml b/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml
index 72d84ba..c03e61b 100644
--- a/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml
@@ -124,6 +124,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCompanyStoreVo"/>
         where store_number = #{storeNumber} and del_flag = '0' limit 1
     </select>
+    <select id="checkStoreNameUnique" parameterType="String" resultMap="CompanyStoreResult">
+        <include refid="selectCompanyStoreVo"/>
+        where name = #{name} and del_flag = '0' limit 1
+    </select>
 
     <insert id="insertCompanyStore" parameterType="CompanyStore" useGeneratedKeys="true" keyProperty="id">
         insert into zc_company_store