From 007b806898a8bb209eed3d5264c36be59e076a91 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 17 五月 2022 17:13:19 +0800
Subject: [PATCH] 花城E+bug更新
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 10 +++++++---
1 files changed, 7 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 ec6c612..0e30c07 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
@@ -855,7 +855,7 @@
// 判断实有人口是否已存在
log.info("开始查询实有人口是否已存在");
ComMngPopulationDO populationDO = null;
- String populationKey = vo.getCardNo();
+ String populationKey = cardNoAES;
if (!isOnly(populationKey, populationMap)) {
// 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
@@ -865,7 +865,7 @@
// 不存在实有人口,则新增
populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
- populationMap.put(populationDO.getCardNo(),populationDO);
+ populationMap.put(populationKey,populationDO);
}
log.info("查询实有人口是否已存在完成");
@@ -6430,7 +6430,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R deletePopulations(List<Long> ids, Long communityId) {
- comMngPopulationCommunityTagsDAO.deletePopulationRelation(ids,communityId);
+ for(Long id:ids){
+ comMngPopulationCommunityTagsDAO.delete(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getPopulationId,id));
+ comMngPopulationDAO.deleteById(id);
+ comMngPopulationHouseUserDAO.delete(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda().eq(ComMngPopulationHouseUserDO::getPopulId,id));
+ }
return R.ok();
}
--
Gitblit v1.7.1