From 0ef725513d9542363278236b9ad319c30873b183 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 20 九月 2023 15:05:05 +0800
Subject: [PATCH] 基础字段
---
server/service/src/main/java/com/doumee/dao/business/model/Brand.java | 3 +++
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Brand.java b/server/service/src/main/java/com/doumee/dao/business/model/Brand.java
index 38d8d31..0869843 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Brand.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Brand.java
@@ -77,4 +77,7 @@
@TableField(exist = false)
private String imgfullurl;
+ @ApiModelProperty(value = "鍒嗙被涓婚敭")
+ @TableField(exist = false)
+ private Integer categoryId;
}
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