From 74d80f67e70666dbd38b1f0b5e4c0c7772fa5b8c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 九月 2023 15:03:50 +0800
Subject: [PATCH] 休bug
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 be0fe71..c71ad09 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
@@ -152,20 +152,22 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<Brand> wrapper = new QueryWrapper<>(brand);
wrapper.lambda().eq(Brand::getIsdeleted,Constants.ZERO);
- wrapper.lambda().eq(Brand::getStatus,Constants.ZERO);
+// wrapper.lambda().eq(Brand::getStatus,Constants.ZERO);
wrapper.lambda().orderByAsc(Brand::getSortnum);
// 绫诲瀷 0浼佷笟 1骞冲彴
- if (Objects.isNull(user.getCompanyId())) {
+ if (Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())) {
wrapper.lambda().eq(Brand::getType,Constants.ONE);
}else {
- wrapper.lambda().eq(Brand::getType,brand.getCompanyId())
- .or().eq(Brand::getType,Constants.ZERO);
+ wrapper.lambda().and(wapper ->{wapper.eq(Brand::getType,brand.getCompanyId())
+ .or().eq(Brand::getType,Constants.ZERO);} );
}
List<Brand> list = brandMapper.selectList(wrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
for (Brand b:list) {
- b.setImgfullurl(prefixUrl+b.getImgurl());
+ if(StringUtils.isNotBlank(b.getImgurl())){
+ b.setImgfullurl(prefixUrl+b.getImgurl());
+ }
}
return list;
}
--
Gitblit v1.9.3