diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonUtil.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonUtil.java index 752d698ac..cff4fb212 100644 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonUtil.java +++ b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/CommonUtil.java @@ -189,7 +189,7 @@ public class CommonUtil { * @return */ public static String maskPhone(String phone) { - if(!checkIsPhone(phone)){ + if(!checkNumberOnly(phone)){ return null; } diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/StringUtils.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/StringUtils.java index 9be148071..fe4afc20f 100644 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/StringUtils.java +++ b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/StringUtils.java @@ -237,8 +237,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { * @param phone * @return */ - public static String maskPhone(String phone) { - if(!isPhone(phone)){ + public static String maskPhone(String phoneAreaCode,String phone) { + if(CommonUtil.checkPhoneFormat(phoneAreaCode,phone)){ return null; } diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/vo/user/InvitedUserVO.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/vo/user/InvitedUserVO.java index 8b18dfccd..5c424d231 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/vo/user/InvitedUserVO.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/vo/user/InvitedUserVO.java @@ -23,4 +23,5 @@ public class InvitedUserVO { private Date createTime; private String phone; + private String phoneAreaCode; } diff --git a/accompany-base/accompany-core/src/main/resources/sqlmappers/UsersMapper.xml b/accompany-base/accompany-core/src/main/resources/sqlmappers/UsersMapper.xml index c1d11f267..ad081a6cb 100644 --- a/accompany-base/accompany-core/src/main/resources/sqlmappers/UsersMapper.xml +++ b/accompany-base/accompany-core/src/main/resources/sqlmappers/UsersMapper.xml @@ -1110,7 +1110,7 @@