From e23107ef049fefa00cd54a4a2271513da81644f7 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 13 九月 2021 20:23:29 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 c9ac96c..49ed606 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
@@ -464,10 +464,14 @@
                 StringBuffer sb = new StringBuffer();
                 sb.append(record.getTags() + ",");
                 if (record.getIsPartymember().equals(1)) {
-                    sb.append("党员,");
+                    if (!sb.toString().contains("党员")){
+                        sb.append("党员,");
+                    }
                 }
                 if (record.getIsVolunteer().equals(1)) {
-                    sb.append("志愿者,");
+                    if (!sb.toString().contains("志愿者")) {
+                        sb.append("志愿者,");
+                    }
                 }
                 String tags = sb.toString();
                 record.setTags(tags.substring(0, tags.length() - 1));

--
Gitblit v1.7.1