From 0b9c144b5110a7e2a85b2e5581ef304bb81a3ebc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 19:24:35 +0800
Subject: [PATCH] 修改
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 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 9d448c7..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
@@ -152,21 +152,23 @@
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())
- .or().eq(Brand::getType,Constants.ZERO)
+ .or().eq(Brand::getType,Constants.ONE)
);
}
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;
}
@@ -184,14 +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(i->i.eq(Brand::getCompanyId,user.getCompanyId())
- .or().eq(Brand::getType,Constants.ZERO)
+ .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