From bf326b2d437df40d19ca35e80597c8efab478d9f Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 10 九月 2021 11:30:10 +0800
Subject: [PATCH] 修改标签设置bug
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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..b9b8ca6 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
@@ -579,7 +579,7 @@
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setUserId(loginUserInfoVO.getUserId());
sysUserDO.setTags(loginUserInfoVO.getTags());
- int update = userDao.updateById(sysUserDO);
+ int update = userDao.putUserTag(sysUserDO);
if (update > 0) {
return R.ok();
}
@@ -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