From d5b7ec2f5564b863ee221fe5f8af0450a2ae3e9c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 九月 2023 14:26:37 +0800
Subject: [PATCH] 基础字段
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 4a73f34..9d448c7 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
@@ -158,8 +158,9 @@
if (Objects.isNull(user.getCompanyId())) {
wrapper.lambda().eq(Brand::getType,Constants.ONE);
}else {
- wrapper.lambda().eq(Brand::getCompanyId,brand.getCompanyId())
- .or().eq(Brand::getType,Constants.ZERO);
+ wrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
+ .or().eq(Brand::getType,Constants.ZERO)
+ );
}
List<Brand> list = brandMapper.selectList(wrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
@@ -187,10 +188,9 @@
if (Objects.isNull(user.getCompanyId())) {
queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
}else {
- queryWrapper.lambda().and(wreapper->{
- wreapper.eq(Brand::getType,pageWrap.getModel().getCompanyId())
- .or().eq(Brand::getType,Constants.ZERO);});
-
+ queryWrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
+ .or().eq(Brand::getType,Constants.ZERO)
+ );
}
queryWrapper.lambda().orderByAsc(Brand::getSortnum);
IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
--
Gitblit v1.9.3