xuxiuxi

2017-07-26 b1793f4381ec6f66390afaae0c2314db711ff1ed

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/CheckInDao.java

@@ -55,7 +55,8 @@
                        "d.company_id," +

                        "e.post_name," +

                        "a.mobile_phone," +

                        "a.warning" +

                        "a.warning," +

                        "a.company" +

                        " FROM" +

                        " register a" +

                        " LEFT JOIN company d ON d.company_id = a.company_id" +

@@ -66,9 +67,9 @@
                        " 1 = 1";

                String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();

                if(isVisitorList) {

                    sql +=  " AND f.device_company_id = " + deviceCompanyId;

                }else{

                    sql +=  " AND ( f.device_company_id != " + deviceCompanyId+" OR f.device_company_id IS NULL"+")";

                }else{

                    sql +=  " AND ( f.device_company_id = " + deviceCompanyId + " or a.visitor_or_attender='attender')";

                }



                if(searchText != null && !searchText.trim().isEmpty()) {

@@ -95,6 +96,10 @@
                    cqi.setCompanyId(c.getString(c.getColumnIndex("company_id")));

                    cqi.setPostName(c.getString(c.getColumnIndex("post_name")));

                    cqi.setMobilePhone(c.getString(c.getColumnIndex("mobile_phone")));

                    String company = c.getString(c.getColumnIndex("company"));

                    if (company != null && !"".equals(company)) {

                        cqi.setCompanyName(company);

                    }

                    cqi.setWarning(c.getString(c.getColumnIndex("warning")));

                    list.add(cqi);

                }