From 1fbd4413550ebe1b7f7a91f61bffaeb77dc23959 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 14:11:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java |   23 ++++++++++++++++++++---
 1 files changed, 20 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 ede23e4..ed3ef97 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
@@ -234,9 +234,6 @@
             comMngPopulationDO.setActId(comActDO.getCommunityId());
             comMngPopulationDO.setStreetId(comActDO.getStreetId());
             comMngPopulationDO.setLabel(Joiner.on(",").join(userTag));
-            if(!userTag.isEmpty()){
-                //特殊群体插入
-            }
             comMngPopulationDO.setVillageName(comMngVillageDO.getGroupAt());
             populationDOList.add(comMngPopulationDO);
             index++;
@@ -436,4 +433,24 @@
                 ,pageInputUserDTO.getPageSize()), pageInputUserDTO);
         return R.ok(iPage);
     }
+
+    /**
+     * 删除特殊群体人员
+     * @param id    特殊群体id
+     * @return  删除结果
+     */
+    @Override
+    public R deleteSpecialInputUser(Long id){
+        //查询特殊群体人员
+        ComMngPopulationDO populationDO = this.baseMapper.selectById(id);
+        if(populationDO == null){
+            return R.fail("未查询到该记录");
+        }
+        populationDO.setLabel(null);
+        if(this.baseMapper.updateById(populationDO) > 0){
+            return R.ok();
+        }else{
+            return R.fail();
+        }
+    }
 }

--
Gitblit v1.7.1