From 116e919af930037f4e5ece0b085e22feb0d50e5d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 11 九月 2023 14:33:37 +0800
Subject: [PATCH] #平台素材库
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 f5c19c8..d764fea 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,7 +88,14 @@
@Override
public void updateById(Brand brand) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(brandMapper.selectCount(new QueryWrapper<Brand>().eq("ISDELETED",Constants.ZERO).ne("id",brand.getId()).eq("name",brand.getName()))>0){
+ 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),
+ i->i.apply(" name = '"+brand.getName()+"' and type = 1 ")
+ .or().apply( " name = '"+brand.getName()+"' and COMPANY_ID = '"+user.getCompanyId()+"' and type = 0 ")
+ )
+ )>0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+brand.getName()+"銆戝凡瀛樺湪");
};
brand.setStatus(Constants.ZERO);
@@ -125,10 +132,15 @@
@Override
public List<Brand> findList(Brand brand) {
+ 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().orderByAsc(Brand::getSortnum);
+ // 绫诲瀷 0浼佷笟 1骞冲彴
+ if (Objects.isNull(user.getCompanyId())) {
+ wrapper.lambda().eq(Brand::getType,Constants.ONE);
+ }
List<Brand> list = brandMapper.selectList(wrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
+ systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
@@ -140,6 +152,7 @@
@Override
public PageData<Brand> findPage(PageWrap<Brand> pageWrap) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
IPage<Brand> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Brand> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
@@ -150,6 +163,10 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Brand::getStatus, pageWrap.getModel().getStatus());
}
+ // 绫诲瀷 0浼佷笟 1骞冲彴
+ if (Objects.isNull(user.getCompanyId())) {
+ queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
+ }
queryWrapper.lambda().orderByAsc(Brand::getSortnum);
IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
--
Gitblit v1.9.3