From 7bbf08d2a38d91bf4a1cf278c52ff7303e05fdaf Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 18:11:06 +0800
Subject: [PATCH] 标签报事+通知公告
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index 33cb754..dadb38f 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -112,8 +112,8 @@
List<TreeNode> houseNodeList = householdService.selectHouseNodeList(AuthUtil.getUserId());
for (TreeNode treeNode : houseNodeList) {
// 判断房屋类型类型
- if (treeNode.getDoorplateType().equals(DictConstant.SMALL_DOORPLATE) ||
- (treeNode.getDoorplateType().equals(DictConstant.centre_DOORPLATE) &&
+ if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
+ (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
treeNode.getAddressLevel().equals(1))) {
treeNode.setAddressType(2);
} else {
@@ -123,13 +123,14 @@
// 查询场所集合信息
List<TreeNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
for (TreeNode treeNode : placeNodeList) {
- if (treeNode.getDoorplateType().equals(DictConstant.SMALL_DOORPLATE) ||
- (treeNode.getDoorplateType().equals(DictConstant.centre_DOORPLATE) &&
- treeNode.getAddressLevel().equals(1))) {
- treeNode.setAddressType(2);
- } else {
- treeNode.setAddressType(3);
- }
+ treeNode.setAddressType(2);
+// if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
+// (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
+// treeNode.getAddressLevel().equals(1))) {
+// treeNode.setAddressType(2);
+// } else {
+// treeNode.setAddressType(3);
+// }
}
if (houseNodeList.size() > 0 && placeNodeList.size() > 0) {
// 合并
--
Gitblit v1.9.3