From ab09389c59dcfc5277cf91ed1f244a8a439e7113 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 24 五月 2022 09:30:53 +0800
Subject: [PATCH] 花城E+bug更新

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java |   71 ++++++++++++++++++++++++++++++-----
 1 files changed, 61 insertions(+), 10 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 32bfb24..2e1ef35 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
@@ -925,6 +925,7 @@
                                 iterator.remove();
                         }
                         comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 
@@ -1230,7 +1231,12 @@
                             if (!labelList.contains(s))
                                 iterator.remove();
                         }
-                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+                        }
+                        else{
+                            comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        }
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 
@@ -1536,7 +1542,12 @@
                             if (!labelList.contains(s))
                                 iterator.remove();
                         }
-                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+                        }
+                        else{
+                            comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        }
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 
@@ -1842,7 +1853,12 @@
                             if (!labelList.contains(s))
                                 iterator.remove();
                         }
-                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+                        }
+                        else{
+                            comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        }
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 
@@ -2148,7 +2164,12 @@
                             if (!labelList.contains(s))
                                 iterator.remove();
                         }
-                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+                        }
+                        else{
+                            comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        }
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 
@@ -2455,7 +2476,12 @@
                             if (!labelList.contains(s))
                                 iterator.remove();
                         }
-                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+                        }
+                        else{
+                            comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        }
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 
@@ -2761,7 +2787,12 @@
                             if (!labelList.contains(s))
                                 iterator.remove();
                         }
-                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+                        }
+                        else{
+                            comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        }
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 
@@ -3066,7 +3097,12 @@
                             if (!labelList.contains(s))
                                 iterator.remove();
                         }
-                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+                        }
+                        else{
+                            comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        }
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 
@@ -3371,7 +3407,12 @@
                             if (!labelList.contains(s))
                                 iterator.remove();
                         }
-                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+                        }
+                        else{
+                            comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        }
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 
@@ -3676,7 +3717,12 @@
                             if (!labelList.contains(s))
                                 iterator.remove();
                         }
-                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+                        }
+                        else{
+                            comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        }
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 
@@ -3986,7 +4032,12 @@
                             if (!labelList.contains(s))
                                 iterator.remove();
                         }
-                        comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+                            comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+                        }
+                        else{
+                            comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+                        }
                         comMngPopulationCommunityTagsDO.setUpdateBy(userId);
                         updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
 

--
Gitblit v1.7.1