sf

jiangping

2025-04-30 dcdb0231034810232f2542f3865666ebf72daf11

 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)
            );