From 6fcaaff0895c06bdbad8310559676528840394cf Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 15:31:33 +0800
Subject: [PATCH] #联调修改
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 16 ++++++++++------
1 files changed, 10 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 c71ad09..02f664f 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 (Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())) {
wrapper.lambda().eq(Brand::getType,Constants.ONE);
}else {
- wrapper.lambda().and(wapper ->{wapper.eq(Brand::getType,brand.getCompanyId())
- .or().eq(Brand::getType,Constants.ZERO);} );
+ wrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
+ .or().eq(Brand::getType,Constants.ONE)
+ );
}
List<Brand> list = brandMapper.selectList(wrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
@@ -185,15 +186,18 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Brand::getStatus, pageWrap.getModel().getStatus());
}
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(Brand::getType, pageWrap.getModel().getType());
+ }
// 绫诲瀷 0浼佷笟 1骞冲彴
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.ONE)
+ );
}
+ queryWrapper.lambda().orderByAsc(Brand::getType);
queryWrapper.lambda().orderByAsc(Brand::getSortnum);
IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
--
Gitblit v1.9.3