From a7dc5d2d03deacb8c7c0028a46aba2f141f35649 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 16 八月 2021 20:19:09 +0800
Subject: [PATCH] Merge branch 'master' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 daa29d2..2b5a526 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;
@@ -355,12 +356,12 @@
comMngUserTagDO.setTagName(comMngTagVO.getTagName());
comMngUserTagDAO.updateById(comMngUserTagDO);
}else{
- ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getCommunityId,comMngTagVO.getCommunityId()).eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
- if(comMngUserTagDO != null){
- if (comMngUserTagDO.getCommunityId().equals(comMngTagVO.getCommunityId()))
+ ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.getSpecialInputUserTagsByVO(comMngTagVO);
+ if(comMngUserTagDO != null && comMngUserTagDO.getCommunityId().equals(comMngTagVO.getCommunityId())){
return R.fail("标签重复");
}
ComMngUserTagDO comMngUserTagDO1 = new ComMngUserTagDO();
+ comMngUserTagDO1.setId(Snowflake.getId());
comMngUserTagDO1.setTagName(comMngTagVO.getTagName());
comMngUserTagDO1.setCommunityId(comMngTagVO.getCommunityId());
comMngUserTagDO1.setSysFlag(0);
--
Gitblit v1.7.1