From c0ae300279e632a99a2e608af718bfb7f5143a9b Mon Sep 17 00:00:00 2001 From: Carina Date: Thu, 6 Jan 2022 19:51:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E5=8D=8E=E4=B8=BA?= =?UTF-8?q?OBS=20log4j=E9=A3=8E=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index 8787c516..61714768 100644 --- a/pom.xml +++ b/pom.xml @@ -383,15 +383,6 @@ true - - - com.huaweicloud - esdk-obs-java - 3.20.6.1 - provided - true - - From be6f7aa503ecf5d4f12eb6bcf26f15812013577c Mon Sep 17 00:00:00 2001 From: wangjiaxing Date: Fri, 28 Jan 2022 15:05:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=98=AF=E5=90=A6=E8=A2=AB=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/user/service/impl/UserRoleRefServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java index a4da1324..ac678539 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java @@ -338,7 +338,7 @@ public class UserRoleRefServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("role_id", roleId); - return this.count(queryWrapper) == 0; + return this.count(queryWrapper) > 0; } @Override @@ -350,7 +350,7 @@ public class UserRoleRefServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.in("role_id", Convert.toList(roleIds)); - return this.count(queryWrapper) == 0; + return this.count(queryWrapper) > 0; }