k94314517
2023-09-18 d5b7ec2f5564b863ee221fe5f8af0450a2ae3e9c
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
@@ -158,8 +158,9 @@
        if (Objects.isNull(user.getCompanyId())) {
            wrapper.lambda().eq(Brand::getType,Constants.ONE);
        }else {
            wrapper.lambda().eq(Brand::getCompanyId,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()
@@ -187,10 +188,9 @@
        if (Objects.isNull(user.getCompanyId())) {
            queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
        }else {
            queryWrapper.lambda().and(wreapper->{
                wreapper.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.ZERO)
            );
        }
        queryWrapper.lambda().orderByAsc(Brand::getSortnum);
        IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);