|
|
@@ -38,6 +38,7 @@ import java.time.LocalDate;
|
|
|
import java.time.ZoneId;
|
|
|
import java.time.temporal.ChronoUnit;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Stream;
|
|
|
|
|
|
@Service
|
|
|
public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements CustomerService {
|
|
|
@@ -2742,26 +2743,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
|
|
|
@Override
|
|
|
public boolean checkUserName(String uid,String userName) {
|
|
|
- String name2=null;
|
|
|
- if (userName.contains("(")){
|
|
|
- name2=userName.replace("(","(").replace(")",")");
|
|
|
- }else if (userName.contains("(")){
|
|
|
- name2=userName.replace("(","(").replace(")",")");
|
|
|
- }
|
|
|
+ // 统一处理中英文括号转换
|
|
|
+ String convertedName = userName.replaceAll("\\(", "(").replaceAll("\\)", ")");
|
|
|
+ String originalOrConvertedName = userName.equals(convertedName) ?
|
|
|
+ userName.replaceAll("(", "\\(").replaceAll(")", "\\)") : convertedName;
|
|
|
List<UserNamesListBo> list=userNamesMapper.checkUserName(userName);
|
|
|
- List<UserNamesListBo> list2=userNamesMapper.checkUserName(name2);
|
|
|
- int i=0;
|
|
|
- for (UserNamesListBo userNamesListBo : list) {
|
|
|
- if (!userNamesListBo.getUid().equals(uid)){
|
|
|
- i++;
|
|
|
- }
|
|
|
- }
|
|
|
- for (UserNamesListBo userNamesListBo : list2) {
|
|
|
- if (!userNamesListBo.getUid().equals(uid)){
|
|
|
- i++;
|
|
|
- }
|
|
|
- }
|
|
|
- return i > 0;
|
|
|
+ List<UserNamesListBo> list2=userNamesMapper.checkUserName(originalOrConvertedName);
|
|
|
+ long count = Stream.concat(list.stream(), list2.stream()).filter(e -> !e.getUid().equals(uid)).count();
|
|
|
+ return count > 0;
|
|
|
}
|
|
|
|
|
|
@Override
|