From 7aaa4ea0906328fc18eba492a4017c847ef2b04d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 15 九月 2023 16:12:55 +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 d764fea..8ae6091 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
@@ -45,8 +45,8 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(brandMapper.selectCount(new QueryWrapper<Brand>()
.eq("ISDELETED",Constants.ZERO)
- .eq(user.getType().equals(Constants.UserType.SYSTEM),"name",brand.getName())
- .and(user.getType().equals(Constants.UserType.COMPANY),
+ .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
+ .and(user.getType().equals(Constants.UserType.COMPANY.getKey()),
i->i.apply(" name = '"+brand.getName()+"' and type = 1 ")
.or().apply( " name = '"+brand.getName()+"' and COMPANY_ID = '"+user.getCompanyId()+"' and type = 0 ")
)
@@ -90,8 +90,8 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(brandMapper.selectCount(new QueryWrapper<Brand>()
.eq("ISDELETED",Constants.ZERO)
- .eq(user.getType().equals(Constants.UserType.SYSTEM),"name",brand.getName())
- .and(user.getType().equals(Constants.UserType.COMPANY),
+ .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
+ .and(user.getType().equals(Constants.UserType.COMPANY.getKey()),
i->i.apply(" name = '"+brand.getName()+"' and type = 1 ")
.or().apply( " name = '"+brand.getName()+"' and COMPANY_ID = '"+user.getCompanyId()+"' and type = 0 ")
)
@@ -140,6 +140,9 @@
// 绫诲瀷 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()
@@ -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.SYSTEM, Constants.BRAND_IMG).getCode();
brandIPage.getRecords().forEach(i->{
i.setImgfullurl(prefixUrl+i.getImgurl());
});
--
Gitblit v1.9.3