From bbf99592983d1d3bbf62982932e444ec409e54b3 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 10 九月 2021 12:18:53 +0800
Subject: [PATCH] 分页查询用户管理标签设置

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 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 b9b8ca6..47ca873 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
@@ -14,7 +14,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -461,18 +460,29 @@
 //            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("无");
+            if (StringUtils.isNotEmpty(record.getTags())) {
+                String tags = record.getTags() + ",";
+                if (record.getIsPartymember().equals(1)) {
+                    tags = tags + "党员,";
+                }
+                if (record.getIsVolunteer().equals(1)) {
+                    tags = tags + "志愿者,";
+                }
+                record.setTags(tags.substring(0, tags.length() - 1));
+            }else {
+                StringBuffer sb = new StringBuffer();
+                if (record.getIsPartymember().equals(1)) {
+                    sb.append("党员,");
+                }
+                if (record.getIsVolunteer().equals(1)) {
+                    sb.append("志愿者,");
+                }
+                String tags = sb.toString();
+                if (tags.length() > 0) {
+                    record.setTags(tags.substring(0, tags.length() - 1));
+                } else {
+                    record.setTags("无");
+                }
             }
         });
         return R.ok(iPage);

--
Gitblit v1.7.1