From 7a2e1fd9e34ab58caf9fa8565e94dd9fcd174a1a Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 12 六月 2021 17:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_excel610' into test_excel610
---
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 6877494..4615f92 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