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();