【fix】增量数据同步,FeedItem无法做count(Id)
This commit is contained in:
parent
df3ee1fb5e
commit
36da82daff
@ -578,7 +578,9 @@ public class CommonServiceImpl implements CommonService {
|
|||||||
param.setIsDeleted(null);
|
param.setIsDeleted(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
dataBatchHistory.setSfNum(countSfNum(connect, param));
|
if (!"FeedItem".equals(api) && !"ContentFolderMember ".equals(api)) {
|
||||||
|
dataBatchHistory.setSfNum(countSfNum(connect, param));
|
||||||
|
}
|
||||||
|
|
||||||
getAllSfData(param, connect, dataReport);
|
getAllSfData(param, connect, dataReport);
|
||||||
|
|
||||||
@ -901,6 +903,7 @@ public class CommonServiceImpl implements CommonService {
|
|||||||
paramMap.put("key", key);
|
paramMap.put("key", key);
|
||||||
paramMap.put("value", false);
|
paramMap.put("value", false);
|
||||||
maps.add(paramMap);
|
maps.add(paramMap);
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<String, Object> paramMap = Maps.newHashMap();
|
Map<String, Object> paramMap = Maps.newHashMap();
|
||||||
@ -909,7 +912,7 @@ public class CommonServiceImpl implements CommonService {
|
|||||||
maps.add(paramMap);
|
maps.add(paramMap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (existsIds.contains(id)) {
|
if (existsIds.contains(id)) {
|
||||||
customMapper.updateById(api, maps, id);
|
customMapper.updateById(api, maps, id);
|
||||||
|
|||||||
@ -2961,6 +2961,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
|
|||||||
for (int j = 1; j <= sized; j++) {
|
for (int j = 1; j <= sized; j++) {
|
||||||
SObject account = new SObject();
|
SObject account = new SObject();
|
||||||
account.setType(api);
|
account.setType(api);
|
||||||
|
String message = null ;
|
||||||
//给对象赋值
|
//给对象赋值
|
||||||
for (DataField dataField : list) {
|
for (DataField dataField : list) {
|
||||||
String field = dataField.getField();
|
String field = dataField.getField();
|
||||||
@ -2993,7 +2994,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
|
|||||||
if (m != null && !m.isEmpty()) {
|
if (m != null && !m.isEmpty()) {
|
||||||
account.setField(field, m.get("new_id"));
|
account.setField(field, m.get("new_id"));
|
||||||
}else {
|
}else {
|
||||||
String message = "对象类型:" + api + "的数据:"+ data.get(j - 1).get("Id") +"的引用对象:" + reference_to + "的数据:"+ data.get(j - 1).get(field) +"不存在!";
|
message = "对象类型:" + api + "的数据:"+ data.get(j - 1).get("Id") +"的引用对象:" + reference_to + "的数据:"+ data.get(j - 1).get(field) +"不存在!";
|
||||||
log.info(message);
|
log.info(message);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -3006,6 +3007,9 @@ public class DataImportNewServiceImpl implements DataImportNewService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (message != null){
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (dataObject.getIsEditable()){
|
if (dataObject.getIsEditable()){
|
||||||
account.setField("old_owner_id__c", data.get(j - 1).get("OwnerId"));
|
account.setField("old_owner_id__c", data.get(j - 1).get("OwnerId"));
|
||||||
account.setField("old_sfdc_id__c", data.get(j - 1).get("Id"));
|
account.setField("old_sfdc_id__c", data.get(j - 1).get("Id"));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user