From 7a282d69e08d875a016975ea4b980bec98a9bab8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 18:06:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/four_member' into four_member
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
index a9e6dc8..9cbe22a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
@@ -361,12 +361,12 @@
comMngUserTagDAO.updateById(comMngUserTagDO);
} else {
ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.getSpecialInputUserTagsByVO(comMngTagVO);
- if (comMngUserTagDO != null && comMngUserTagDO.getCommunityId().equals(comMngTagVO.getCommunityId())) {
+ if (comMngUserTagDO != null) {
return R.fail("标签重复");
}
ComMngUserTagDO comMngUserTagDO1 = new ComMngUserTagDO();
comMngUserTagDO1.setTagName(comMngTagVO.getTagName());
- comMngUserTagDO1.setCommunityId(comMngTagVO.getCommunityId());
+// comMngUserTagDO1.setCommunityId(comMngTagVO.getCommunityId());
comMngUserTagDO1.setSysFlag(0);
comMngUserTagDO1.setCreateAt(new Date());
comMngUserTagDAO.insert(comMngUserTagDO1);
--
Gitblit v1.7.1