From faae303cd25f90b1c732b6bc737ede8b8ab714a0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 16:56:28 +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 | 13 ++++++++++++-
1 files changed, 12 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 d81bbe7..0722ea0 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
@@ -6668,13 +6668,24 @@
* @return 删除结果
*/
@Override
- public R deleteSpecialInputUser(Long id) {
+ public R deleteSpecialInputUser(Long id,Long communityId) {
// 查询特殊群体人员
ComMngPopulationDO populationDO = this.baseMapper.selectById(id);
if (populationDO == null) {
return R.fail("未查询到该记录");
}
populationDO.setLabel(null);
+
+ // 清理社区与人口关联信息的label信息
+ List<ComMngPopulationCommunityTagsDO> communityTagsDOList = comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>()
+ .lambda().eq(ComMngPopulationCommunityTagsDO::getPopulationId,id).eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
+ if(communityTagsDOList != null && communityTagsDOList.size() > 0){
+ communityTagsDOList.forEach(communityTags -> {
+ communityTags.setLabel(null);
+ comMngPopulationCommunityTagsDAO.updateById(communityTags);
+ });
+ }
+
if (this.baseMapper.updateById(populationDO) > 0) {
return R.ok();
} else {
--
Gitblit v1.7.1