From 204915ff812119aae775b9d79836d73f89432ecf Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 09 九月 2021 10:16:46 +0800
Subject: [PATCH] 活动报名参加人群去重

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 98a5d94..ce887b1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1834,13 +1834,18 @@
      * @return 标签集合
      */
     @Override
-    public R listTags(Long communityId) {
+    public R listTags() {
         List<String> list = new ArrayList<>();
         List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
-            .selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
+            .selectList(null);
         if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
-            list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
-                .collect(Collectors.toList());
+            for (ComMngUserTagDO comMngUserTagDO : comMngUserTagDOS) {
+                if (!list.contains(comMngUserTagDO.getTagName())) {
+                    list.add(comMngUserTagDO.getTagName());
+                }
+            }
+//            list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
+//                .collect(Collectors.toList());
         }
         return R.ok(list);
     }

--
Gitblit v1.7.1