修改

jiangping

2023-09-19 0b9c144b5110a7e2a85b2e5581ef304bb81a3ebc

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

@@ -158,8 +158,9 @@
        if (Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())) {
            wrapper.lambda().eq(Brand::getType,Constants.ONE);
        }else {
            wrapper.lambda().and(wapper ->{wapper.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.ONE)
            );
        }
        List<Brand> list = brandMapper.selectList(wrapper);
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
@@ -185,15 +186,18 @@
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(Brand::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getType() != null) {
            queryWrapper.lambda().eq(Brand::getType, pageWrap.getModel().getType());
        }
        // 类型 0企业 1平台
        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.ONE)
            );
        }
        queryWrapper.lambda().orderByAsc(Brand::getType);
        queryWrapper.lambda().orderByAsc(Brand::getSortnum);
        IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
        String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()