From 5a0fff8095cd5356f57c181b7e7b820e0f7efacf Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 20 一月 2022 16:00:14 +0800
Subject: [PATCH] 将项目拆分为两个子项目，监管和督察
---
app/src/main/java/cn/flightfeather/thirdappmodule/activity/ScenseMapActivity.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/activity/ScenseMapActivity.java b/app/src/main/java/cn/flightfeather/thirdappmodule/activity/ScenseMapActivity.java
index ef903f8..9c07d23 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/activity/ScenseMapActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/activity/ScenseMapActivity.java
@@ -1,5 +1,7 @@
package cn.flightfeather.thirdappmodule.activity;
+import static cn.flightfeather.thirdappmodule.util.CommonUtils.getDomainItemByCalalogGuid;
+
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
@@ -61,8 +63,6 @@
import cn.flightfeather.thirdappmodule.util.Constant;
import cn.flightfeather.thirdappmodule.util.Domain;
import cn.flightfeather.thirdappmodule.util.NavigationHelper;
-
-import static cn.flightfeather.thirdappmodule.util.CommonUtils.getDomainItemByCalalogGuid;
public class ScenseMapActivity extends AppCompatActivity implements View.OnClickListener,
RecyclerItemClickListener.OnItemClickListener, DistrictSearch.OnDistrictSearchListener
@@ -310,29 +310,29 @@
+ ";town:" + curArea.getTownCode() + curArea.getTownName());
switch (curArea.getLevel()) {
case Domain.LEVEL_PROVINCE:
- qb = mScenseDao.queryBuilder().where(ScenseDao.Properties.Provincecode.eq(curArea.getProvinceCode()))
+ qb = mScenseDao.queryBuilder().where(ScenseDao.Properties.Provincecode.eq(curArea.getProvinceCode()), ScenseDao.Properties.Extension1.notEq("0"))
.orderAsc(ScenseDao.Properties.Typeid);
break;
case Domain.LEVEL_CITY:
qb = mScenseDao.queryBuilder().where(ScenseDao.Properties.Provincecode.eq(curArea.getProvinceCode()),
- ScenseDao.Properties.Citycode.eq(curArea.getCityCode()))
+ ScenseDao.Properties.Citycode.eq(curArea.getCityCode()), ScenseDao.Properties.Extension1.notEq("0"))
.orderAsc(ScenseDao.Properties.Typeid);
break;
case Domain.LEVEL_DISTRICT:
qb = mScenseDao.queryBuilder().where(ScenseDao.Properties.Provincecode.eq(curArea.getProvinceCode()),
ScenseDao.Properties.Citycode.eq(curArea.getCityCode()),
- ScenseDao.Properties.Districtcode.eq(curArea.getDistrictCode()))
+ ScenseDao.Properties.Districtcode.eq(curArea.getDistrictCode()), ScenseDao.Properties.Extension1.notEq("0"))
.orderAsc(ScenseDao.Properties.Typeid);
break;
case Domain.LEVEL_TOWN:
qb = mScenseDao.queryBuilder().where(ScenseDao.Properties.Provincecode.eq(curArea.getProvinceCode()),
ScenseDao.Properties.Citycode.eq(curArea.getCityCode()),
ScenseDao.Properties.Districtcode.eq(curArea.getDistrictCode()),
- ScenseDao.Properties.Towncode.eq(curArea.getTownCode()))
+ ScenseDao.Properties.Towncode.eq(curArea.getTownCode()), ScenseDao.Properties.Extension1.notEq("0"))
.orderAsc(ScenseDao.Properties.Typeid);
break;
default:
- qb = mScenseDao.queryBuilder().where(ScenseDao.Properties.Provincecode.eq(curArea.getProvinceCode()))
+ qb = mScenseDao.queryBuilder().where(ScenseDao.Properties.Provincecode.eq(curArea.getProvinceCode()), ScenseDao.Properties.Extension1.notEq("0"))
.orderAsc(ScenseDao.Properties.Typeid);
break;
}
--
Gitblit v1.9.3