#联调修改

jiaosong

2023-09-15 7aaa4ea0906328fc18eba492a4017c847ef2b04d

 server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java

@@ -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());
        });