|
@@ -175,7 +175,7 @@ public class DynamicPersonIdUpdateJob {
|
|
|
return CompletableFuture.runAsync(() -> {
|
|
|
try {
|
|
|
String s = restClient.updateByQuery("winhc-company-dynamic/_update_by_query?conflicts=proceed", createUpdate);
|
|
|
- if (s.contains("version_conflicts") && s.contains("\"version_conflicts\": 0")) {
|
|
|
+ if (s.contains("version_conflicts") && s.contains("\"version_conflicts\":0")) {
|
|
|
//do something
|
|
|
} else {
|
|
|
log.error("update error {}", s);
|
|
@@ -224,6 +224,9 @@ public class DynamicPersonIdUpdateJob {
|
|
|
|
|
|
private void remove8(String id, String index, String keyno, String validId, Map<String, Object> data) {
|
|
|
// dingTalkService.send(JSON.toJSONString(data));
|
|
|
+ if (StringUtils.isEmpty(id)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
JSONObject jData = new JSONObject(data);
|
|
|
String dynamic_info = jData.getString("dynamic_info");
|
|
|
if (StringUtils.isEmpty(dynamic_info)) return;
|