From 57e6d99e5d0077ec43418c92991408178090e13a Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 25 七月 2017 16:31:25 +0800
Subject: [PATCH] Failed commit: Default

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java |    4 ++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java     |    2 ++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CompanyDao.java    |    2 ++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CompanyDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CompanyDao.java
index fbc9005..c2c4ab4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CompanyDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CompanyDao.java
@@ -32,6 +32,8 @@
             company.setDeviceCompanyId(c.getString(c.getColumnIndex("device_company_id")));
             company.setIsSynchron(c.getString(c.getColumnIndex("is_synchron")));
             company.setUpdateTime(c.getString(c.getColumnIndex("update_time")));
+            company.setIsValid(c.getString(c.getColumnIndex("is_valid")));
+            company.setCreateTime(c.getString(c.getColumnIndex("create_time")));
             result.add(company);
         }
         return result;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
index 02660dd..73f456a 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
@@ -166,6 +166,8 @@
             device.setType(c.getString(c.getColumnIndex("type")));
             device.setSchoolName(c.getString(c.getColumnIndex("school_name")));
             device.setScrappedDate(c.getString(c.getColumnIndex("scrapped_date")));
+            device.setIsValid(c.getString(c.getColumnIndex("is_valid")));
+            device.setCreateTime(c.getString(c.getColumnIndex("create_time")));
             result.add(device);
         }
         return result;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java
index 983779d..6f7d3d4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DictionaryDao.java
@@ -9,6 +9,8 @@
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.discern.entity.Dictionary;
 
+import static cn.com.basic.face.discern.entity.Register.FieldNames.company;
+
 /**
  * 鏁版嵁瀛楀吀Dao
  */
@@ -161,6 +163,8 @@
          dic.setOrderBy(c.getString(c.getColumnIndex("order_by")));
          dic.setPid(c.getString(c.getColumnIndex("pid")));
          dic.setRemark(c.getString(c.getColumnIndex("remark")));
+         dic.setIsValid(c.getString(c.getColumnIndex("is_valid")));
+         dic.setCreateTime(c.getString(c.getColumnIndex("create_time")));
          result.add(dic);
      }
       return result;

--
Gitblit v1.8.0