From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 268dce7..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;
@@ -355,16 +356,16 @@
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