Merge branch 'master' into txb

tangxiaobao

2021-08-16 a7dc5d2d03deacb8c7c0028a46aba2f141f35649

 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()));
            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);