suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复线索批量导入手机号验重错误

Browse Source
This commit is contained in:
xiaodong.hu
2023-09-08 18:13:25 +08:00
parent 65929c8882
commit f983fce978
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
View File

@@ -202,7 +202,7 @@ public class EcSyncServiceImpl implements EcSyncService {
if (partnerLine != null) {
// EC与沪姨合伙人同时存在的线索用户，但存在不同的跟进人，将沪姨合伙人跟进人信息同步至EC覆盖原EC跟进人信息
if (StringUtil.isEmpty(partnerLine.getInvestmentManager())) {
if (StringUtil.isNotEmpty(resultLine.getInvestmentManager())) {
if (StringUtil.isNotEmpty(resultLine.getInvestmentManager())&&!getFollowLineStatus(partnerLine)) {
resultLine.setId(partnerLine.getId()).setUpdateTime(new Date());
//沪姨合伙人线索存在黑名单，EC该线索分配跟进人同步到沪姨合伙人但线索状态不变，还存在黑名单中
resultLine.setLineStatus(partnerLine.getLineStatus().intValue() == LineStatusEnum.BLACKLIST.getCode().intValue()

7
coolstore-partner-service/src/main/java/com/cool/store/utils/poi/ExcelUtil.java
View File

@@ -604,14 +604,15 @@ public class ExcelUtil<T> {
Map<Integer, List<String>> columnListMap = styleMap.get(row);
if (columnListMap.containsKey(sort)) {
List<String> list = columnListMap.get(sort);
list.addAll(Arrays.asList(styles));
List<String> arrList = new ArrayList<String>(Arrays.asList(styles));
list.addAll(arrList);
columnListMap.put(sort, list);
}else {
columnListMap.put(sort, Arrays.asList(styles));
columnListMap.put(sort, new ArrayList<String>(Arrays.asList(styles)));
}
} else {
styleMap.put(row, new HashMap<Integer, List<String>>() {{
put(sort, Arrays.asList(styles));
put(sort, new ArrayList<String>(Arrays.asList(styles)));
}});
}
}