From a51aea672db61c46da522b4659e7f94af05f5421 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 15 九月 2023 16:32:50 +0800
Subject: [PATCH] #联调修改
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 83aa2a7..c9a2635 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
@@ -118,7 +118,7 @@
@Override
public Brand findById(Integer id) {
String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.BRAND_IMG).getCode();
Brand brand = brandMapper.selectById(id);
brand.setImgfullurl(prefixUrl+brand.getImgurl());
return brand;
@@ -140,10 +140,13 @@
// 绫诲瀷 0浼佷笟 1骞冲彴
if (Objects.isNull(user.getCompanyId())) {
wrapper.lambda().eq(Brand::getType,Constants.ONE);
+ }else {
+ wrapper.lambda().eq(Brand::getType,brand.getCompanyId())
+ .or().eq(Brand::getType,Constants.ZERO);
}
List<Brand> list = brandMapper.selectList(wrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.BRAND_IMG).getCode();
for (Brand b:list) {
b.setImgfullurl(prefixUrl+b.getImgurl());
}
@@ -166,11 +169,14 @@
// 绫诲瀷 0浼佷笟 1骞冲彴
if (Objects.isNull(user.getCompanyId())) {
queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
+ }else {
+ queryWrapper.lambda().eq(Brand::getType,pageWrap.getModel().getCompanyId())
+ .or().eq(Brand::getType,Constants.ZERO);
}
queryWrapper.lambda().orderByAsc(Brand::getSortnum);
IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
brandIPage.getRecords().forEach(i->{
i.setImgfullurl(prefixUrl+i.getImgurl());
});
--
Gitblit v1.9.3