From dcdb0231034810232f2542f3865666ebf72daf11 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 四月 2025 16:45:34 +0800
Subject: [PATCH] sf

---
 server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
index 0dd7643..9db3591 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
@@ -161,6 +161,8 @@
         if (Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())) {
             wrapper.lambda().eq(Brand::getType,Constants.ONE);
         }else {
+            wrapper.lambda().exists(!Objects.isNull(brand.getCategoryId())," select 1 from goods g where g.brand_id = brand.id and g.category_id = "+brand.getCategoryId()+" and  g.COMPANY_ID = "+user.getCompanyId()+" " +
+                    " and g.STATUS = 0 and g.ISDELETED = 0  ");
             wrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
                             .or().eq(Brand::getType,Constants.ONE)
             );

--
Gitblit v1.9.3