From 5dbb5ef23bfb3c5db2d2a4e0a2a977e044df1c89 Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Wed, 14 Jun 2023 18:34:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=87=8D=E5=A4=8D=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E7=9A=84bug=EF=BC=8C=E4=BF=AE=E5=A4=8D=20#I71SNK=20?= =?UTF-8?q?=E9=9D=9E=E8=B6=85=E7=AE=A1=E8=A7=92=E8=89=B2=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E8=A2=AB=E6=8E=88=E6=9D=83=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=8F=9C=E5=8D=95=E8=B5=84=E6=BA=90=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/impl/BizUserServiceImpl.java | 4 +- .../service/impl/ClientUserServiceImpl.java | 4 +- .../user/service/impl/SysUserServiceImpl.java | 42 +++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java index f6ed79d9..eea0c01d 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java @@ -186,7 +186,7 @@ public class BizUserServiceImpl extends ServiceImpl impl throw new CommonException("手机号码：{}格式错误", bizUserAddParam.getPhone()); } if (this.count(new LambdaQueryWrapper() - .eq(BizUser::getPhone, bizUserAddParam.getPhone())) > 0) { + .eq(BizUser::getPhone, CommonCryptogramUtil.doSm4CbcEncrypt(bizUserAddParam.getPhone()))) > 0) { throw new CommonException("存在重复的手机号，手机号为：{}", bizUserAddParam.getPhone()); } } @@ -240,7 +240,7 @@ public class BizUserServiceImpl extends ServiceImpl impl throw new CommonException("手机号码：{}格式错误", bizUserEditParam.getPhone()); } if (this.count(new LambdaQueryWrapper() - .eq(BizUser::getPhone, bizUserEditParam.getPhone()) + .eq(BizUser::getPhone, CommonCryptogramUtil.doSm4CbcEncrypt(bizUserEditParam.getPhone())) .ne(BizUser::getId, bizUserEditParam.getId())) > 0) { throw new CommonException("存在重复的手机号，手机号为：{}", bizUserEditParam.getPhone()); } diff --git a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java index 1f91e024..12ecedc9 100644 --- a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java @@ -147,7 +147,7 @@ public class ClientUserServiceImpl extends ServiceImpl() - .eq(ClientUser::getPhone, clientUserAddParam.getPhone())) > 0) { + .eq(ClientUser::getPhone, CommonCryptogramUtil.doSm4CbcEncrypt(clientUserAddParam.getPhone()))) > 0) { throw new CommonException("存在重复的手机号，手机号为：{}", clientUserAddParam.getPhone()); } } @@ -181,7 +181,7 @@ public class ClientUserServiceImpl extends ServiceImpl() - .eq(ClientUser::getPhone, clientUserEditParam.getPhone()) + .eq(ClientUser::getPhone, CommonCryptogramUtil.doSm4CbcEncrypt(clientUserEditParam.getPhone())) .ne(ClientUser::getId, clientUserEditParam.getId())) > 0) { throw new CommonException("存在重复的手机号，手机号为：{}", clientUserEditParam.getPhone()); } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index 5a52143e..9f8db274 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -264,7 +264,7 @@ public class SysUserServiceImpl extends ServiceImpl impl throw new CommonException("手机号码：{}格式错误", sysUserAddParam.getPhone()); } if (this.count(new LambdaQueryWrapper() - .eq(SysUser::getPhone, sysUserAddParam.getPhone())) > 0) { + .eq(SysUser::getPhone, CommonCryptogramUtil.doSm4CbcEncrypt(sysUserAddParam.getPhone()))) > 0) { throw new CommonException("存在重复的手机号，手机号为：{}", sysUserAddParam.getPhone()); } } @@ -307,7 +307,7 @@ public class SysUserServiceImpl extends ServiceImpl impl throw new CommonException("手机号码：{}格式错误", sysUserEditParam.getPhone()); } if (this.count(new LambdaQueryWrapper() - .eq(SysUser::getPhone, sysUserEditParam.getPhone()) + .eq(SysUser::getPhone, CommonCryptogramUtil.doSm4CbcEncrypt(sysUserEditParam.getPhone())) .ne(SysUser::getId, sysUserEditParam.getId())) > 0) { throw new CommonException("存在重复的手机号，手机号为：{}", sysUserEditParam.getPhone()); } @@ -784,30 +784,30 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public void grantResource(SysUserGrantResourceParam sysUserGrantResourceParam) { - String id = sysUserGrantResourceParam.getId(); - SysUserIdParam sysUserIdParam = new SysUserIdParam(); - List roleIdList = this.ownRole(sysUserIdParam); - if(ObjectUtil.isEmpty(roleIdList)) { - throw new CommonException("非超管角色用户不可被授权系统模块菜单资源"); - } - boolean hasSuperAdminRole = sysRoleService.listByIds(roleIdList).stream().map(SysRole::getCode).collect(Collectors.toSet()) - .contains(SysBuildInEnum.BUILD_IN_ROLE_CODE.getValue()); List menuIdList = sysUserGrantResourceParam.getGrantInfoList().stream() .map(SysUserGrantResourceParam.SysUserGrantResource::getMenuId).collect(Collectors.toList()); - if(!hasSuperAdminRole) { - if(ObjectUtil.isNotEmpty(menuIdList)) { - Set sysModuleIdList = sysMenuService.listByIds(menuIdList).stream().map(SysMenu::getModule).collect(Collectors.toSet()); - boolean containsSystemModule = sysModuleService.listByIds(sysModuleIdList).stream().map(SysModule::getCode) - .collect(Collectors.toSet()).contains(SysBuildInEnum.BUILD_IN_MODULE_CODE.getValue()); - if(containsSystemModule) { + if(ObjectUtil.isNotEmpty(menuIdList)) { + SysUserIdParam sysUserIdParam = new SysUserIdParam(); + sysUserIdParam.setId(sysUserGrantResourceParam.getId()); + List roleIdList = this.ownRole(sysUserIdParam); + Set sysModuleIdList = sysMenuService.listByIds(menuIdList).stream().map(SysMenu::getModule).collect(Collectors.toSet()); + boolean containsSystemModule = sysModuleService.listByIds(sysModuleIdList).stream().map(SysModule::getCode) + .collect(Collectors.toSet()).contains(SysBuildInEnum.BUILD_IN_MODULE_CODE.getValue()); + if(containsSystemModule) { + if(ObjectUtil.isEmpty(roleIdList)) { throw new CommonException("非超管角色用户不可被授权系统模块菜单资源"); + } else { + boolean hasSuperAdminRole = sysRoleService.listByIds(roleIdList).stream().map(SysRole::getCode).collect(Collectors.toSet()) + .contains(SysBuildInEnum.BUILD_IN_ROLE_CODE.getValue()); + if(!hasSuperAdminRole) { + throw new CommonException("非超管角色用户不可被授权系统模块菜单资源"); + } } } + List extJsonList = sysUserGrantResourceParam.getGrantInfoList().stream() + .map(JSONUtil::toJsonStr).collect(Collectors.toList()); + sysRelationService.saveRelationBatchWithClear(sysUserGrantResourceParam.getId(), menuIdList, SysRelationCategoryEnum.SYS_USER_HAS_RESOURCE.getValue(), extJsonList); } - List extJsonList = sysUserGrantResourceParam.getGrantInfoList().stream() - .map(JSONUtil::toJsonStr).collect(Collectors.toList()); - sysRelationService.saveRelationBatchWithClear(id, menuIdList, SysRelationCategoryEnum.SYS_USER_HAS_RESOURCE.getValue(), - extJsonList); } @Override @@ -858,7 +858,7 @@ public class SysUserServiceImpl extends ServiceImpl impl throw new CommonException("手机号码：{}格式错误", sysUserUpdateInfoParam.getPhone()); } if (this.count(new LambdaQueryWrapper().ne(SysUser::getId, sysUser.getId()) - .eq(SysUser::getPhone, sysUserUpdateInfoParam.getPhone())) > 0) { + .eq(SysUser::getPhone, CommonCryptogramUtil.doSm4CbcEncrypt(sysUserUpdateInfoParam.getPhone()))) > 0) { throw new CommonException("存在重复的手机号，手机号为：{}", sysUserUpdateInfoParam.getPhone()); } }