From 265445daeac5f5ebcdead3215aa20a15885cfd46 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Wed, 15 Oct 2025 16:56:58 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=88=86=E4=BA=AB=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=20=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6(=E5=95=86=E5=93=81=E5=90=8D/?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=B1=BB=E5=88=AB)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/base/service/impl/CuMemberServiceImpl.java  |  7 +++++++
 .../main/resources/mapper/sale/wares/BdWaresMapper.xml | 10 +++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

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 8fca1f7c..be804df0 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
@@ -1,6 +1,7 @@
 package com.hzs.member.base.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.lang.tree.Tree;
@@ -2464,6 +2465,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         Set<Long> pkMemberList = new HashSet<>();
 
         for (ShowWaresDTO showWaresDTO : showWaresDTOS) {
+            if(CollUtil.isEmpty(showWaresDTO.getWaresAuthorityList())){
+                continue;
+            }
             for (BdWaresAuthority bw : showWaresDTO.getWaresAuthorityList()) {
                 if (bw.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue() || bw.getAuthorityType() == EWaresPermissionType.BLOOD_STOP.getValue()) {
                     // 血缘关系
@@ -2501,6 +2505,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         }
 
         for (ShowWaresDTO showWaresDTO : showWaresDTOS) {
+            if(CollUtil.isEmpty(showWaresDTO.getWaresAuthorityList())){
+                continue;
+            }
             boolean isShowWares = true;
             for (BdWaresAuthority bdWaresAuthority : showWaresDTO.getWaresAuthorityList()) {
                 if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue()) {
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml
index 78c6dc95..c2e06f55 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml
@@ -505,6 +505,13 @@
         inner join bd_wares_extend be
         on bw.pk_id = be.pk_wares
         left join BD_AREA_CLASSIFY bac on bac.pk_id = bw.PK_AREA_CLASSIFY
+        <if test="param.pkAreaClassify != null">
+            right join (select pk_id
+            from BD_AREA_CLASSIFY cm
+            start with cm.pk_id = #{param.pkAreaClassify}
+            connect by prior cm.pk_id = cm.pk_parent
+            order by level) te on te.pk_id = bw.PK_AREA_CLASSIFY
+        </if>
         where bw.del_flag = 0
         and be.del_flag = 0
         and be.is_put_on = 0
@@ -519,9 +526,6 @@
         <if test="param.pkCountry != null">
             and bw.pk_country = #{param.pkCountry}
         </if>
-        <if test="param.pkAreaClassify != null">
-            and bw.PK_AREA_CLASSIFY = #{param.pkAreaClassify} or bac.pk_parent = #{param.pkAreaClassify}
-        </if>
         <if test="param.waresName != null and param.waresName != ''">
             and bw.WARES_NAME = '%' || #{param.waresName} || '%'
         </if>