From bd2981aa458c2b34e157b7b7817558dbd9629f7e Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Thu, 9 Oct 2025 16:10:09 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=90=8E=E5=8F=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=94=B6=E7=9B=8A=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/impl/CuMemberServiceImpl.java   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
index c6cf30ea..9db6f7e2 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
@@ -3577,6 +3577,12 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         CheckRegionVO checkRegionVO = this.getRegionForBack(param);
         BdArea province = iAreaServiceApi.getArea(param.getProvince()).getData();
         CuMemberRegionExt cuMemberRegionExt = iCuMemberRegionService.getRegionByMember(userId, param.getType());
+
+        LambdaQueryWrapper<CuMemberRegion> cuMemberRegionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getDelFlag, EDelFlag.UN_DELETE.getValue());
+        cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getEffective, EEffective.EFFECTIVE.getValue());
+
+
         if(ObjectUtil.isNotEmpty(cuMemberRegionExt)){
             return AjaxResult.error("已选择区域, 不允许重复添加!");
         }
@@ -3584,6 +3590,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
             return AjaxResult.error("选择区域省不存在，请重新选择");
         }
         if (param.getType() == 1 && checkRegionVO.isProvince()) {
+            cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getProvince, param.getProvince());
+            cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getCity, 0);
+            cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getCounty, 0);
             param.setCity(0);
             param.setCounty(0);
         } else if (param.getType() == 2 && checkRegionVO.isCity()) {
@@ -3594,6 +3603,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
                     return AjaxResult.error("选择区域市不存在，请重新选择");
                 }
             }
+            cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getCity, param.getCity());
+            cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getCounty, 0);
             param.setCounty(0);
         } else if (param.getType() == 3 && checkRegionVO.isCounty()) {
             // 校验区是否存在
@@ -3603,6 +3614,11 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
                     return AjaxResult.error("选择区域区不存在，请重新选择");
                 }
             }
+            cuMemberRegionLambdaQueryWrapper.eq(CuMemberRegion::getCounty, param.getCounty());
+        }
+        int count = iCuMemberRegionService.count(cuMemberRegionLambdaQueryWrapper);
+        if(count > 0){
+            return AjaxResult.error("该区域已被选择, 不允许重复添加!");
         }
         if (ObjectUtil.isNotEmpty(cuMemberRegionExt)) {
             param.setPkId(cuMemberRegionExt.getPkId());