From de117d0d65ef6a332a9ba5dfc4a60b15beed9137 Mon Sep 17 00:00:00 2001
From: SjS <email@example.com>
Date: Thu, 10 Apr 2025 10:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=92=8C=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/bst/agreement/mapper/AgreementMapper.xml     | 6 +++++-
 .../bst/agreement/service/impl/AgreementServiceImpl.java   | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml
index df97bc6..eed8376 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml
@@ -33,6 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bag.update_time,
             su.user_name,
             ba.name as area_name
+            <include refid="searchTables"></include>
+    </sql>
+
+    <sql id="searchTables">
         from bst_agreement bag
         left join sys_user su on bag.store_id = su.user_id
         left join bst_area ba on bag.area_id = ba.id
@@ -69,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectDistinct" resultType="com.ruoyi.bst.agreement.domain.AgreementVO">
         <include refid="selectAgreementVo"/>
-        where bag.store_id = #{storeId} and bag.agreement_type = #{agreementType} and (bag.id != #{id} or #{id} is null)
+        where bag.area_id = #{areaId} and bag.agreement_type = #{agreementType} and (bag.id != #{id} or #{id} is null)
     </select>
 
     <!--查询最新的协议信息-->
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java
index c8cbc2a..03ec04f 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/agreement/service/impl/AgreementServiceImpl.java
@@ -95,10 +95,9 @@ public class AgreementServiceImpl implements AgreementService
     private void distinct(Agreement agreement) {
         if (agreement.getAreaId() != null){
             AreaVO area = areaService.selectAreaById(agreement.getAreaId());
-            if (area !=null){
-                agreement.setStoreId(area.getUserId());
-                ServiceUtil.assertion(agreementMapper.selectDistinct(agreement)!= null,"当前分类已存在协议");
-            };
+            ServiceUtil.assertion(area == null,"当前区域不存在");
+            agreement.setStoreId(area.getUserId());
+            ServiceUtil.assertion(agreementMapper.selectDistinct(agreement)!= null,"当前运营区已存在同类协议");
         }
     }