jiangping
2023-09-19 bd732b4fea72b65aabade0dfb14ddb1346ad3f8f
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
@@ -159,7 +159,7 @@
            wrapper.lambda().eq(Brand::getType,Constants.ONE);
        }else {
            wrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
                            .or().eq(Brand::getType,Constants.ZERO)
                            .or().eq(Brand::getType,Constants.ONE)
            );
        }
        List<Brand> list = brandMapper.selectList(wrapper);
@@ -186,12 +186,15 @@
        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(i->i.eq(Brand::getCompanyId,user.getCompanyId())
                    .or().eq(Brand::getType,Constants.ZERO)
                    .or().eq(Brand::getType,Constants.ONE)
            );
        }
        queryWrapper.lambda().orderByAsc(Brand::getSortnum);