From 2ae0446917184b36996823e9dbf452dba82e8994 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 21 四月 2017 12:31:44 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
index e19794a..aabc67f 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/CheckInMng.java
@@ -31,13 +31,16 @@
     }
 
     public void add(RequestParams params, final String visitReasonId) {
+        if (!BaseApplication.deviceAvailable) {
+            return;
+        }
         params.setUri(AppApi.BASE_URL +AppApi.VISIT_ADD);
         x.http().post(params, new BaseCommonCallBack() {
             @Override
             public void success() {
                 Toast.makeText(BaseApplication.getInstance(),"娣诲姞鎴愬姛", Toast.LENGTH_SHORT).show();
                 CheckInFragment.getInstance().resetForm();
-                if (visitReasonId != null && !"".equals(visitReasonId)) {
+                if (visitReasonId == null || "".equals(visitReasonId)) {
                     DictionaryMng.getInstance().loadVisitReasonList();
                 }
             }
@@ -45,11 +48,14 @@
     }
 
     public void findCheckInLeftList(final boolean isVisitorList, final boolean isSortByDept, String searchText, final int pageNum, final boolean append) {
+        if (!BaseApplication.deviceAvailable) {
+            return;
+        }
         RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.CHECK_IN_QUERY);
         if (isVisitorList) {
-            params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+            params.addBodyParameter(CheckInQueryCondition.FieldNames.visitorCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
         } else {
-            params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getCompanyId());
+            params.addBodyParameter(CheckInQueryCondition.FieldNames.employeeCompanyId, BaseApplication.getInstance().getDevice().getDeviceCompanyId());
         }
         params.addBodyParameter(CheckInQueryCondition.FieldNames.username, searchText);
         params.addBodyParameter(CommonVariables.Page.PAGE_NUM, pageNum+"");
@@ -100,6 +106,9 @@
     }
 
     private void sort(List<CheckInQueryItem> list, final boolean sortedByDept) {
+        if (!BaseApplication.deviceAvailable) {
+            return;
+        }
         Collections.sort(list, new Comparator<CheckInQueryItem>() {
             @Override
             public int compare(CheckInQueryItem t1, CheckInQueryItem t2) {

--
Gitblit v1.8.0