From ec584b22c5756b8a2bdad9dcd0830c52d698784d Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 11 六月 2021 20:24:30 +0800
Subject: [PATCH] 实有人口导入

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 e1adf13..ef2cac1 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
@@ -465,7 +465,10 @@
                     populationDO.setHouseNo(vo.getHouseNo());
                     populationDO.setHouseAddress(address);
                     populationDO.setCardNo(AESUtil.encrypt128(populationDO.getCardNo(), aesKey));
-                    populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey));
+                    if(StringUtils.isNotEmpty(populationDO.getPhone())){
+                        populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey));
+                    }
+
                     populationDO.setHouseId(populationHouseDO.getId());
                     this.baseMapper.updateById(populationDO);
                 }
@@ -481,6 +484,7 @@
                     populationHouseUserDO.setHouseId(populationHouseDO.getId());
                     populationHouseUserDO.setPopulId(populationDO.getId());
                     populationHouseUserDO.setRelation(populationDO.getRelation());
+                    populationHouseUserDO.setRelationStr(populationDO.getRelationStr());
                     comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
                 }
             }

--
Gitblit v1.7.1