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 | 16 ++++++++++++----
1 files changed, 12 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 47ca873..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
@@ -461,13 +461,19 @@
record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
if (StringUtils.isNotEmpty(record.getTags())) {
- String tags = record.getTags() + ",";
+ StringBuffer sb = new StringBuffer();
+ sb.append(record.getTags() + ",");
if (record.getIsPartymember().equals(1)) {
- tags = tags + "党员,";
+ if (!sb.toString().contains("党员")){
+ sb.append("党员,");
+ }
}
if (record.getIsVolunteer().equals(1)) {
- tags = tags + "志愿者,";
+ if (!sb.toString().contains("志愿者")) {
+ sb.append("志愿者,");
+ }
}
+ String tags = sb.toString();
record.setTags(tags.substring(0, tags.length() - 1));
}else {
StringBuffer sb = new StringBuffer();
@@ -588,7 +594,9 @@
public R putUserTag(LoginUserInfoVO loginUserInfoVO) {
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setUserId(loginUserInfoVO.getUserId());
- sysUserDO.setTags(loginUserInfoVO.getTags());
+ if (StringUtils.isNotEmpty(loginUserInfoVO.getTags()) && !"无".equals(loginUserInfoVO.getTags())) {
+ sysUserDO.setTags(loginUserInfoVO.getTags());
+ }
int update = userDao.putUserTag(sysUserDO);
if (update > 0) {
return R.ok();
--
Gitblit v1.7.1