From 82a1f1f5bb68bd5a01d9ccc0bee9dd09c49d1319 Mon Sep 17 00:00:00 2001 From: aeizzz <1129603149@qq.com> Date: Fri, 30 Dec 2022 16:29:33 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=92=89=E9=92=89=E7=94=A8=E6=88=B7=E6=98=AF?= =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E9=83=A8=E9=97=A8=E5=A4=84=E7=90=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/admin/service/impl/SysTenantServiceImpl.java | 3 +-- .../pigx/admin/service/impl/SysUserServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java index 28344a9fb..e812f0e90 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java @@ -136,8 +136,7 @@ public class SysTenantServiceImpl extends ServiceImpl newMenuList = menuService - .list(Wrappers.lambdaQuery().in(SysMenu::getMenuId,split)); + List newMenuList = menuService.list(Wrappers.lambdaQuery().in(SysMenu::getMenuId, split)); menuList.addAll(newMenuList); }); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index 546370663..13e7b7e94 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -413,11 +413,14 @@ public class SysUserServiceImpl extends ServiceImpl impl } // 删除手机号中的 +86 前缀 String phone = item.getPhone().split("-")[1]; + boolean exsitPhone = userList.stream().anyMatch(sysUser -> phone.equals(sysUser.getPhone())); if (exsitPhone) { errorMsg.add(MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, item.getPhone())); } - String deptName = item.getDeptName().split(",")[0]; + // 根据规则获取部门信息 + String[] deptNameList = item.getDeptName().split(",")[0].split("-"); + String deptName = deptNameList[deptNameList.length - 1]; // 判断输入的部门名称列表是否合法 Optional deptOptional = deptList.stream().filter(dept -> deptName.equals(dept.getName())) .findFirst();