From ac4d876533a711a12704ea50e609342e13b2ca08 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 16 八月 2021 16:12:17 +0800
Subject: [PATCH] 实有人口导入bug修改

---
 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 ebdfa56..daa29d2 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
@@ -355,16 +355,17 @@
             comMngUserTagDO.setTagName(comMngTagVO.getTagName());
             comMngUserTagDAO.updateById(comMngUserTagDO);
         }else{
-            int count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getCommunityId,comMngTagVO.getCommunityId()).eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
-            if(count>0){
-               return R.fail("标签重复");
+            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()))
+                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