From 5fa9999fd5b8b53fa4eb8f534c7335c68e04059d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 15 九月 2023 17:37:36 +0800
Subject: [PATCH] #联调修改
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 c9a2635..d76e4c7 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
@@ -88,14 +88,17 @@
@Override
public void updateById(Brand brand) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(brandMapper.selectCount(new QueryWrapper<Brand>()
- .eq("ISDELETED",Constants.ZERO)
- .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
+
+ Brand brand1 = brandMapper.selectOne(new QueryWrapper<Brand>()
+ .eq("ISDELETED", Constants.ZERO)
+ .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 ")
- )
- )>0){
+ i -> i.apply(" name = '" + brand.getName() + "' and type = 1 ")
+ .or().apply(" name = '" + brand.getName() + "' and COMPANY_ID = '" + user.getCompanyId() + "' and type = 0 ")
+ ).last("limit 1")
+ );
+
+ if(Objects.nonNull(brand1) && (!brand.getId().equals(brand.getId()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+brand.getName()+"銆戝凡瀛樺湪");
};
brand.setStatus(Constants.ZERO);
@@ -117,8 +120,8 @@
@Override
public Brand findById(Integer id) {
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.BRAND_IMG).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
Brand brand = brandMapper.selectById(id);
brand.setImgfullurl(prefixUrl+brand.getImgurl());
return brand;
@@ -145,8 +148,8 @@
.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.BRAND_IMG).getCode();
+ 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());
}
@@ -175,7 +178,7 @@
}
queryWrapper.lambda().orderByAsc(Brand::getSortnum);
IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
brandIPage.getRecords().forEach(i->{
i.setImgfullurl(prefixUrl+i.getImgurl());
--
Gitblit v1.9.3