pp

jiangping

2023-09-20 c166834a4aa5545a30115ea0195dab8dbab59fbd

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

@@ -48,7 +48,8 @@
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(brandMapper.selectCount(new QueryWrapper<Brand>()
                .eq("ISDELETED",Constants.ZERO)
                .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
                 .and(user.getType().equals(Constants.UserType.SYSTEM.getKey()), wapper->wapper.lambda().eq(Brand::getType,Constants.ONE).eq(Brand::getName,brand.getName()))
//               .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 ")
@@ -101,7 +102,8 @@

        Brand brand1 = brandMapper.selectOne(new QueryWrapper<Brand>()
                .eq("ISDELETED", Constants.ZERO)
                .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()), "name", brand.getName())
                  .and(user.getType().equals(Constants.UserType.SYSTEM.getKey()), wapper->wapper.lambda().eq(Brand::getType,Constants.ONE).eq(Brand::getName,brand.getName()))
//              .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 ")
@@ -153,6 +155,7 @@
        QueryWrapper<Brand> wrapper = new QueryWrapper<>(brand);
        wrapper.lambda().eq(Brand::getIsdeleted,Constants.ZERO);
//        wrapper.lambda().eq(Brand::getStatus,Constants.ZERO);
        wrapper.lambda().orderByAsc(Brand::getType);
        wrapper.lambda().orderByAsc(Brand::getSortnum);
        // 类型 0企业 1平台
        if (Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())) {