From c166834a4aa5545a30115ea0195dab8dbab59fbd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 九月 2023 15:12:10 +0800
Subject: [PATCH] pp
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
index 045762f..0dd7643 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
+++ b/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 ")
--
Gitblit v1.9.3