From 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:53:24 +0800
Subject: [PATCH] Merge branch 'txb'

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 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 c46f91e..4000486 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
@@ -23,6 +23,7 @@
 import com.panzhihua.common.model.vos.user.InputUserInfoVO;
 import com.panzhihua.common.utlis.IdCard;
 import com.panzhihua.common.utlis.SensitiveUtil;
+import com.panzhihua.common.utlis.Snowflake;
 import com.panzhihua.common.utlis.StringUtils;
 import com.panzhihua.service_user.dao.ComMngUserTagDAO;
 import com.panzhihua.service_user.dao.SysUserInputDAO;
@@ -349,22 +350,22 @@
                 return R.fail("系统预置标签不可修改");
             }
             ComMngUserTagDO exist = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
-            if(null!=exist && exist.getId()!=comMngUserTagDO.getId()){
+            if(null!=exist && !exist.getId().equals(comMngTagVO.getId())){
                 return R.fail("标签重复");
             }
             comMngUserTagDO.setTagName(comMngTagVO.getTagName());
             comMngUserTagDAO.updateById(comMngUserTagDO);
         }else{
-            int count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
-            if(count>0){
-               return R.fail("标签重复");
+            ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.getSpecialInputUserTagsByVO(comMngTagVO);
+            if(comMngUserTagDO != null && comMngUserTagDO.getCommunityId().equals(comMngTagVO.getCommunityId())){
+                return R.fail("标签重复");
             }
-            ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO();
-            comMngUserTagDO.setTagName(comMngTagVO.getTagName());
-            comMngUserTagDO.setCommunityId(comMngTagVO.getCommunityId());
-            comMngUserTagDO.setSysFlag(0);
-            comMngUserTagDO.setCreateAt(new Date());
-            comMngUserTagDAO.insert(comMngUserTagDO);
+            ComMngUserTagDO comMngUserTagDO1 = new ComMngUserTagDO();
+            comMngUserTagDO1.setTagName(comMngTagVO.getTagName());
+            comMngUserTagDO1.setCommunityId(comMngTagVO.getCommunityId());
+            comMngUserTagDO1.setSysFlag(0);
+            comMngUserTagDO1.setCreateAt(new Date());
+            comMngUserTagDAO.insert(comMngUserTagDO1);
         }
         return R.ok();
     }

--
Gitblit v1.7.1