From 1c25ba497cb4b80c313367bcf141c97c92bdf585 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 11:40:07 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
index cc508c8..53b4900 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/AttendanceDao.java
@@ -42,23 +42,25 @@
ResultBean resultBean = new ResultBean();
SQLiteDatabase db = MainActivity.getInstance().db;
try {
+ String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
StringBuilder sb = new StringBuilder(40);
sb.append("SELECT b.register_id,").append(" b.username,").append(" b.surveillance_photo,")
- .append(" b.identify_num,").append(" e.post_name,").append(" d.`name` gender,")
+ .append(" b.identify_num,").append(" e.post_name,").append(" d.name gender,")
.append(" f.dept_name").append(" FROM ").append(" employee a ")
.append(" LEFT JOIN register b ON a.register_id = b.register_id ")
.append(" LEFT JOIN dictionary d ON d.dict_id = b.gender_id ")
.append(" LEFT JOIN post e ON e.post_id = b.post_id ")
.append(" LEFT JOIN department f ON f.dept_id = b.department_id ")
- .append(" WHERE ").append(" 1 = 1 ").append(" GROUP BY b.register_id ")
- .append(" ORDER BY b.username ");
- String deviceCompanyId = BaseApplication.getInstance().getAndroidDevice().getCompanyId();
+ .append(" WHERE ").append(" 1 = 1 ");
if(deviceCompanyId != null && !deviceCompanyId.trim().isEmpty()) {
sb.append(" AND a.device_company_id = ").append(deviceCompanyId);
}
if(searchText != null && !searchText.trim().isEmpty()) {
sb.append(" AND b.username LIKE '%").append(searchText).append("%'");
}
+ sb.append(" GROUP BY b.register_id ")
+ .append(" ORDER BY b.username ");
+
StringBuilder count = new StringBuilder(sb.length());
count.append("select count(*) as count from (").append(sb).append(" ) _table");
sb.append(" LIMIT ").append(getStartIndex(pageNum)).append(",").append(CommonVariables.Page.DEFAULT_PAGE_SIZE);
--
Gitblit v1.8.0