From d533de7a1be171a4319bcf91a43dec16070bff65 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 19:03:00 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 a2ea07c..57e7a42 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
@@ -434,9 +434,10 @@
             }
             String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
             //判断实有人口是否已存在
-            ComMngPopulationDO populationDO = this.baseMapper.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
+            ComMngPopulationDO populationDO = null;
+            List<ComMngPopulationDO> populationDOList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda()
                     .eq(ComMngPopulationDO::getCardNo, cardNoAES));
-            if (populationDO == null) {
+            if (populationDOList.isEmpty()) {
                 //不存在实有人口,则新增
                 populationDO = savePopulationDO(vo, comActDO, comMngVillageDO);
 //                ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = savePopulationHouseUser(vo, populationDO, populationHouseDO);
@@ -445,7 +446,7 @@
 //                if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) {
 //                    populationDO = updatePopulationDO(vo, populationDO);
 //                }
-                populationDO = updatePopulationDO(vo, comActDO, populationDO);
+                populationDO = updatePopulationDO(vo, comActDO, populationDOList.get(0));
             }
 
             //处理实有人口房屋居住信息

--
Gitblit v1.7.1