From 1ec5ff7b1443e4b205b953875fd876fd6e76fce0 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 09 八月 2017 12:22:33 +0800
Subject: [PATCH] capnproto update to 7.0dev
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
index da49fc3..7b5c1b0 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java
@@ -69,7 +69,7 @@
if(isVisitorList) {
sql += " AND ( f.device_company_id != " + deviceCompanyId+" OR f.device_company_id IS NULL"+")";
}else{
- sql += " AND f.device_company_id = " + deviceCompanyId;
+ sql += " AND ( f.device_company_id = " + deviceCompanyId + " or a.visitor_or_attender='attender')";
}
if(searchText != null && !searchText.trim().isEmpty()) {
@@ -244,6 +244,7 @@
ContentValues contentValues = new ContentValues();
contentValues.put("visit_id",item.getVisitId());
contentValues.put("visit_reason_id",item.getVisitReasonId());
+ contentValues.put("visit_reason",item.getVisitReason());
contentValues.put("remark",item.getRemark());
contentValues.put("enter_time",item.getEnterTime());
contentValues.put("exit_time",item.getExitTime());
@@ -258,6 +259,7 @@
contentValues.put("is_synchron",item.getIsSynchron());
contentValues.put("device_company_id",item.getDeviceCompanyId());
contentValues.put("create_time",item.getCreateTime());
+ contentValues.put("device_id", item.getDeviceId());
long registerId = MainActivity.getInstance().db.insert("visit", "", contentValues);
return registerId;
--
Gitblit v1.8.0