From a5e6e7061cbef6912f294dcfd2cb88f472f8ca6f Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 19 九月 2023 14:26:40 +0800
Subject: [PATCH] 企业端
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 9d448c7..56ef6a8 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,10 +152,10 @@
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().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
@@ -166,7 +166,9 @@
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;
}
@@ -189,7 +191,7 @@
queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
}else {
queryWrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
- .or().eq(Brand::getType,Constants.ZERO)
+ .or().eq(Brand::getType,Constants.ONE)
);
}
queryWrapper.lambda().orderByAsc(Brand::getSortnum);
--
Gitblit v1.9.3