From c51f001c351637f26250cb576c4a788874b262df Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Wed, 10 May 2023 14:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=94=BE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcNeighborHoodServiceImpl.java       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index 55d7d172e5..6795750504 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -798,20 +798,20 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
 
         needUpdateList.forEach(
                 needUpdate->{
-                    if (StringUtils.isNotBlank(needUpdate.getOpenTypeName())){
-                        if (needUpdate.getOpenTypeName().equals("自然村")){
-                            needUpdate.setOpenType("2");
+                    if (StringUtils.isNotBlank(needUpdate.getViliageTypeName())){
+                        if (needUpdate.getViliageTypeName().equals("自然村")){
+                            needUpdate.setViliageType("2");
                         }
-                        if (needUpdate.getOpenTypeName().equals("住宅小区")){
-                            needUpdate.setOpenType("1");
+                        if (needUpdate.getViliageTypeName().equals("住宅小区")){
+                            needUpdate.setViliageType("1");
                         }
                     }
-                    if (StringUtils.isNotBlank(needUpdate.getViliageTypeName())){
-                        if (needUpdate.getViliageTypeName().equals("封闭式")){
-                            needUpdate.setViliageTypeName("1");
+                    if (StringUtils.isNotBlank(needUpdate.getOpenTypeName())){
+                        if (needUpdate.getOpenTypeName().equals("封闭式")){
+                            needUpdate.setOpenType("1");
                         }
-                        if (needUpdate.getViliageTypeName().equals("开放式")){
-                            needUpdate.setViliageTypeName("2");
+                        if (needUpdate.getOpenTypeName().equals("开放式")){
+                            needUpdate.setOpenType("2");
                         }
                     }
                 });