From 80b28b6826520424007c6e53a790304f606080f1 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 06 九月 2021 09:43:16 +0800
Subject: [PATCH] 特殊群体标签统一由运营后台进行配置

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 fbbada2..8169492 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
@@ -458,8 +458,22 @@
         IPage<AppletUserInfoVO> iPage =
             userDao.pageUser(new Page<>(userInfoVO.getPageNum(), userInfoVO.getPageSize()), userInfoVO);
         iPage.getRecords().forEach(record -> {
-            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
+//            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
             record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
+
+            StringBuilder sb = new StringBuilder();
+            if (record.getIsPartymember().equals(1)) {
+                sb.append("党员,");
+            }
+            if (record.getIsVolunteer().equals(1)) {
+                sb.append("志愿者,");
+            }
+            String tag = sb.toString();
+            if (tag.length() > 0) {
+                record.setTags(tag.substring(0, tag.length() - 1));
+            } else {
+                record.setTags("无");
+            }
         });
         return R.ok(iPage);
     }
@@ -1820,10 +1834,10 @@
      * @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());

--
Gitblit v1.7.1