From 2a8241df4493a36b046855f2283b1c3da9e6bfbe Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 18 九月 2023 18:37:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java |   46 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 33 insertions(+), 13 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 d76e4c7..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
@@ -42,6 +42,9 @@
     private SystemDictDataBiz systemDictDataBiz;
     @Override
     public Integer create(Brand brand) {
+        if(StringUtils.isBlank(brand.getName())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         if(brandMapper.selectCount(new QueryWrapper<Brand>()
                 .eq("ISDELETED",Constants.ZERO)
@@ -52,7 +55,14 @@
                 )
         )>0){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+brand.getName()+"銆戝凡瀛樺湪");
-        };
+        }
+        if(Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())){
+            //骞冲彴鍝佺墝
+            brand.setType(Constants.ONE);
+        }else{
+            brand.setType(Constants.ZERO);
+            brand.setCompanyId(user.getCompanyId());
+        }
         brand.setStatus(Constants.ZERO);
         brand.setCreateDate(new Date());
         brand.setCreator(user.getId());
@@ -100,7 +110,9 @@
 
         if(Objects.nonNull(brand1) && (!brand.getId().equals(brand.getId()))){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+brand.getName()+"銆戝凡瀛樺湪");
-        };
+        }
+        brand.setType(null);
+        brand.setCompanyId(null);
         brand.setStatus(Constants.ZERO);
         brand.setEditDate(new Date());
         brand.setEditor(user.getId());
@@ -120,10 +132,12 @@
 
     @Override
     public Brand findById(Integer id) {
-        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());
+        if(StringUtils.isNotBlank(brand.getImgurl())){
+            String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+                    + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
+            brand.setImgfullurl(prefixUrl+brand.getImgurl());
+        }
         return brand;
     }
 
@@ -138,20 +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().eq(Brand::getType,brand.getCompanyId())
-                    .or().eq(Brand::getType,Constants.ZERO);
+            wrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
+                            .or().eq(Brand::getType,Constants.ZERO)
+            );
         }
         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;
     }
@@ -173,15 +190,18 @@
         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().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
+                    .or().eq(Brand::getType,Constants.ONE)
+            );
         }
         queryWrapper.lambda().orderByAsc(Brand::getSortnum);
         IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
         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());
+            if(StringUtils.isNotBlank(i.getImgurl())){
+                i.setImgfullurl(prefixUrl+i.getImgurl());
+            }
         });
         return PageData.from(brandIPage);
     }

--
Gitblit v1.9.3