From fdb8ac1598885d7d509c1210b63b772c3b3d2156 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 14 Feb 2025 16:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=B1=BB=E5=93=81=E7=89=8CBUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/mapper/BasicdataBrandCategoryMapper.java   | 2 +-
 .../basicdata/mapper/BasicdataBrandCategoryMapper.xml    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java
index bc78bf873..8f26b01e1 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java
@@ -50,5 +50,5 @@ public interface BasicdataBrandCategoryMapper extends BaseMapper<BasicdataBrandC
 	 * @param basicdataBrandCategory
 	 * @return
 	 */
-	IPage<BasicdataBrandCategoryVO> selectBasicdataBrandCategoryPage(IPage<BasicdataBrandCategoryVO> page, BasicdataBrandCategoryVO basicdataBrandCategory);
+	IPage<BasicdataBrandCategoryVO> selectBasicdataBrandCategoryPage(IPage<BasicdataBrandCategoryVO> page,@Param("param") BasicdataBrandCategoryVO basicdataBrandCategory);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml
index fd4f395fa..842ca2ae3 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml
@@ -41,6 +41,15 @@
         logpm_basicdata_brand_category AS lbbc
         LEFT JOIN logpm_basicdata_brand AS lbb ON lbbc.brand_id = lbb.id
         LEFT JOIN logpm_basicdata_category AS lbc  ON lbbc.category_id = lbc.id
+       <where>
+           lbbc.is_deleted = 0
+           <if test="param.brandName != null and param.brandName != ''">
+              AND  lbb.id = #{param.brandName}
+           </if>
+           <if test="param.name != null and param.name != ''">
+              AND  lbc.id = #{param.name}
+           </if>
+       </where>
         GROUP BY
         lbbc.id
     </select>