解决冲突

jiangping

2023-09-14 31c9104b7e4f963110ee581ac05a3a5addc109f5

 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 ")
                )