#联调修改

jiaosong

2023-09-15 a51aea672db61c46da522b4659e7f94af05f5421

 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 ")
                )
@@ -118,7 +118,7 @@
    @Override
    public Brand findById(Integer id) {
        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();
        Brand brand = brandMapper.selectById(id);
        brand.setImgfullurl(prefixUrl+brand.getImgurl());
        return brand;
@@ -140,10 +140,13 @@
        // 类型 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()
                + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
                + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.BRAND_IMG).getCode();
        for (Brand b:list) {
            b.setImgfullurl(prefixUrl+b.getImgurl());
        }
@@ -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.OSS, Constants.BRAND_IMG).getCode();
        brandIPage.getRecords().forEach(i->{
            i.setImgfullurl(prefixUrl+i.getImgurl());
        });