From 5d34e1c6d20e2666370a8d7118577f92d442e258 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 8 Aug 2017 20:28:20 +0800
Subject: [PATCH] update code

---
 .../main/java/com/lyms/platform/operate/web/result/BabyPageResult.java  | 2 +-
 .../java/com/lyms/platform/operate/web/service/SyncDataTaskService.java | 2 +-
 .../src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
index b67cc29..a66a7e5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
@@ -501,7 +501,7 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
         setId(destModel.getId());
         setPid(destModel.getPid());
         setBabyName(destModel.getName());
-        setSex(SexEnum.getTextById(destModel.getSex()));
+        setSex(destModel.getSex() == null ? "" :  SexEnum.getTextById(destModel.getSex()));
         setBabyBirthday(DateUtil.getyyyy_MM_dd(destModel.getBirth()));
         setMonthAge(DateUtil.getBabyMonthAge(destModel.getBirth(), new Date()));
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
index 849ee54..5b613c7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
@@ -99,7 +99,7 @@ public class SyncDataTaskService {
         query.setNeed("0");
         List<SyncDataModel> list = syncDataService.querySyncData(query);
         for (SyncDataModel model : list) {
-            if (MongoSyncUtil.syncSll(model.getAction(), model.getJsonData(), model.getDataId(), model.getClassName())) {
+            if (MongoSyncUtil.sync(model.getAction(), model.getJsonData(), model.getDataId(), model.getClassName())) {
                 model.setStatus(0);
                 model.setModified(new Date());
                 syncDataService.updateSyncData(model);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java
index 7a6ea70..3910649 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java
@@ -57,7 +57,7 @@ public class BabyListTask implements Callable {
                 } else {
                     result.setHighRisk("高危");
                 }
-                result.setSex(StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
+                result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
                 result.setBabyName(StringUtils.emptyDeal(model.getName()));
                 result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));
                 result.setMommyName(StringUtils.emptyDeal(model.getMname()));
-- 
1.8.3.1