diff --git a/rds-console/console-admin/src/main/java/com/tongtech/web/controller/system/SysProfileController.java b/rds-console/console-admin/src/main/java/com/tongtech/web/controller/system/SysProfileController.java index 16e7a12c60ec9906b359826d0ad7238b488e26e7..eb22f1b11157cdc321443f93bce764a892308aa6 100644 --- a/rds-console/console-admin/src/main/java/com/tongtech/web/controller/system/SysProfileController.java +++ b/rds-console/console-admin/src/main/java/com/tongtech/web/controller/system/SysProfileController.java @@ -68,12 +68,12 @@ public class SysProfileController extends BaseController LoginUser loginUser = getLoginUser(); SysUser sysUser = loginUser.getUser(); user.setUserName(sysUser.getUserName()); - if (StringUtils.isNotEmpty(user.getPhonenumber()) + if (StringUtils.isNotBlank(user.getPhonenumber()) && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,手机号码已存在"); } - if (StringUtils.isNotEmpty(user.getEmail()) + if (StringUtils.isNotBlank(user.getEmail()) && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return AjaxResult.error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在"); diff --git a/rds-console/console-system/src/main/java/com/tongtech/system/service/impl/SysMenuServiceImpl.java b/rds-console/console-system/src/main/java/com/tongtech/system/service/impl/SysMenuServiceImpl.java index c4c3773afc917a95c13765d29f171b69ab742451..eae7a74b1819a7635f6babdf186764f2b7bd4b83 100644 --- a/rds-console/console-system/src/main/java/com/tongtech/system/service/impl/SysMenuServiceImpl.java +++ b/rds-console/console-system/src/main/java/com/tongtech/system/service/impl/SysMenuServiceImpl.java @@ -92,7 +92,7 @@ public class SysMenuServiceImpl implements ISysMenuService Set permsSet = new HashSet<>(); for (String perm : perms) { - if (StringUtils.isNotEmpty(perm)) + if (StringUtils.isNotBlank(perm)) { permsSet.addAll(Arrays.asList(perm.trim().split(","))); } @@ -113,7 +113,7 @@ public class SysMenuServiceImpl implements ISysMenuService Set permsSet = new HashSet<>(); for (String perm : perms) { - if (StringUtils.isNotEmpty(perm)) + if (StringUtils.isNotBlank(perm)) { permsSet.addAll(Arrays.asList(perm.trim().split(","))); } @@ -404,7 +404,7 @@ public class SysMenuServiceImpl implements ISysMenuService public String getComponent(SysMenu menu) { String component = UserConstants.LAYOUT; - if (StringUtils.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) + if (StringUtils.isNotBlank(menu.getComponent()) && !isMenuFrame(menu)) { component = menu.getComponent(); }