From d00ea6bb3daa0ee1be1c7f8dbe57cc7a16342474 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 12:00:12 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java | 2 +-
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/CompanyUpSync.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/CompanyUpSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/CompanyUpSync.java
index 1daca6b..8df7eee 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/CompanyUpSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/CompanyUpSync.java
@@ -37,7 +37,7 @@
String tableName = "company";
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.TWO_WAY_SYNCHRON);
params.addBodyParameter("tableName", tableName);
- params.addBodyParameter("synDate", SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
+ params.addBodyParameter("synDate",SynchronRecordDao.getInstance().getSynRecord(tableName)==null?"":SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
params.addBodyParameter("data", JSONArray.toJSONString(CompanyDao.getInstance().getCompanyList(BaseApplication.getInstance().getAndroidDevice().getCompanyId())));
params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java
index 9fbefff..ce61fc4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DeviceUpSync.java
@@ -38,7 +38,7 @@
String tableName = "device";
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.TWO_WAY_SYNCHRON);
params.addBodyParameter("tableName", tableName);
- params.addBodyParameter("synDate", SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
+ params.addBodyParameter("synDate", SynchronRecordDao.getInstance().getSynRecord(tableName)==null?"":SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
params.addBodyParameter("data", JSONArray.toJSONString(DeviceDao.getInstance().getDeviceList(BaseApplication.getInstance().getAndroidDevice().getCompanyId())));
params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java
index 1d3bfa4..67b902d 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sync/up/DictionaryUpSync.java
@@ -37,7 +37,7 @@
String tableName = "dictionary";
RequestParams params = new RequestParams(AppApi.BASE_URL + AppApi.TWO_WAY_SYNCHRON);
params.addBodyParameter("tableName", tableName);
- params.addBodyParameter("synDate", SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
+ params.addBodyParameter("synDate", SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime()==null?"":SynchronRecordDao.getInstance().getSynRecord(tableName).getSynchronTime());
params.addBodyParameter("data", JSONArray.toJSONString(DictionaryDao.getInstance().getDictionayList(BaseApplication.getInstance().getAndroidDevice().getCompanyId())));
params.addBodyParameter("deviceCompanyId",BaseApplication.getInstance().getAndroidDevice().getCompanyId());
x.http().post(params, new BaseCommonCallBack() {
--
Gitblit v1.8.0