|
|
@@ -92,7 +92,7 @@ public class UserClueServiceImpl extends BaseMybatisDao<UserMapper> implements U
|
|
|
mobile=split[0];
|
|
|
mobileList.addAll(Arrays.asList(split));
|
|
|
if (!in.getContactMobileMore().equals("-")){
|
|
|
- String[] split2 = in.getContactMobile().split(";");
|
|
|
+ String[] split2 = in.getContactMobileMore().split(";");
|
|
|
mobileList.addAll(Arrays.asList(split2));
|
|
|
}
|
|
|
}
|
|
|
@@ -188,22 +188,21 @@ public class UserClueServiceImpl extends BaseMybatisDao<UserMapper> implements U
|
|
|
StringBuilder msg = new StringBuilder();
|
|
|
int size=0;
|
|
|
for (OutUserClueExcel e : list) {
|
|
|
+ User user = null;
|
|
|
try {
|
|
|
checkMobile(e.getContactMobile());
|
|
|
checkMobile(e.getContactMobileMore());
|
|
|
checkContacts(e.getContacts());
|
|
|
-
|
|
|
+ //判定客户名称
|
|
|
+ user = checkUserName(e.getNickname());
|
|
|
}catch (BusinessException ex){
|
|
|
size++;
|
|
|
msg.append("<br/>客户[").append(e.getNickname()).append("]导入失败,原因:").append(ex.getMessage()).append(" ");
|
|
|
continue;
|
|
|
}
|
|
|
- //判定客户名称
|
|
|
- User user = checkUserName(e.getNickname());
|
|
|
|
|
|
InputUserClueBo inUserClueBo = new InputUserClueBo();
|
|
|
inUserClueBo.setUserName(e.getNickname());
|
|
|
-
|
|
|
inUserClueBo.setContactMobile(e.getContactMobile());
|
|
|
inUserClueBo.setContacts(e.getContacts());
|
|
|
inUserClueBo.setContactMobileMore(e.getContactMobileMore());
|
|
|
@@ -385,9 +384,11 @@ public class UserClueServiceImpl extends BaseMybatisDao<UserMapper> implements U
|
|
|
}
|
|
|
if (user!=null){
|
|
|
if (user.getShareType()==0){
|
|
|
- throw new BusinessException("客户已经存在私有");
|
|
|
+ throw new BusinessException("客户已经存在私有客户");
|
|
|
}else if (user.getShareType()==2){
|
|
|
- throw new BusinessException("客户已经存在签单");
|
|
|
+ throw new BusinessException("客户已经存在签单客户");
|
|
|
+ }else if (user.getShareType()==5){
|
|
|
+ throw new BusinessException("客户已经存在线索客户");
|
|
|
}
|
|
|
return user;
|
|
|
}
|