|
|
@@ -6,7 +6,6 @@ import java.text.SimpleDateFormat;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.HashSet;
|
|
|
-import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
@@ -518,10 +517,12 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
@Override
|
|
|
public void checkCustomer(Set<CustomerExcelBo> boSet, Set<Integer> existRows, Set<Integer> filterRows) {
|
|
|
List<User> list = null;
|
|
|
- for (CustomerExcelBo bo : boSet) {
|
|
|
+ CustomerExcelBo[] bos = (CustomerExcelBo[])boSet.toArray(new CustomerExcelBo[] {});
|
|
|
+ for (int i=0;i<bos.length;i++) {
|
|
|
+ CustomerExcelBo bo = bos[i];
|
|
|
CustomerExcelBo ceb = null;
|
|
|
- for(Iterator<CustomerExcelBo> it = boSet.iterator();it.hasNext();){ //先自检
|
|
|
- ceb = it.next();
|
|
|
+ for(int j=0;j<i;j++){
|
|
|
+ ceb = bos[j];
|
|
|
if(bo.getCustomerType().equals(AFTConstants.USER_TYPE_PERSONAL)){ //个人
|
|
|
if(ceb.getMobile().equals(bo.getMobile()) && ceb.getCustomerType().equals(bo.getCustomerType())){
|
|
|
bo.setUid(ceb.getUid());
|
|
|
@@ -536,7 +537,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
filterRows.add(bo.getRowNumber());
|
|
|
break;
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
if(StringUtils.isBlank(bo.getUid())){ //是否已经存在
|
|
|
if(bo.getCustomerType().equals(AFTConstants.USER_TYPE_PERSONAL)){
|