From 3f50420b42259a88f7e623b16c14b00f52071f4c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 九月 2021 17:30:24 +0800
Subject: [PATCH] Merge branch 'test' into test_bak

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index c228905..27e3c7d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -472,25 +472,27 @@
                         break;
                     case 2:
                         comMngPopulationVO.setRoad(houseDO.getAlley());
-                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
+//                        comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                         break;
                     case 3:
                         comMngPopulationVO.setRoad(houseDO.getAlley());
                         comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
-                        comMngPopulationVO.setFloor(houseDO.getFloor());
+//                        comMngPopulationVO.setFloor(houseDO.getFloor());
                         break;
                     case 4:
                         comMngPopulationVO.setRoad(houseDO.getAlley());
                         comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                         comMngPopulationVO.setFloor(houseDO.getFloor());
-                        comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
+//                        comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
                         break;
                     case 5:
                         comMngPopulationVO.setRoad(houseDO.getAlley());
                         comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
                         comMngPopulationVO.setFloor(houseDO.getFloor());
                         comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
-                        comMngPopulationVO.setHouseNo(houseDO.getHouseNo());
+                        if(comMngPopulationVO.getLevelIsAll() == null){
+                            comMngPopulationVO.setHouseNo(houseDO.getHouseNo());
+                        }
                         break;
                     default:
                         break;

--
Gitblit v1.7.1