修改新增社区 不同区域同名字社区添加报错

lidongdong

2023-07-05 e2970b6e0050a480c799cb0aae255a9da04740b1

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1258,12 +1258,12 @@
    public R addUserBackstage(AdministratorsUserVO administratorsUserVO) {

        List<SysUserDO> list=userDao.selectList(new QueryWrapper<SysUserDO>().lambda().
                       eq(SysUserDO::getAppId,administratorsUserVO.getAppid()).
                eq(SysUserDO::getAccount,administratorsUserVO.getAccount()));
        if(list!=null || list.size()>0)
        if(list!=null && list.size()>0)
        {
            return R.fail("账户已存在！");
        }


        ComActVO comActVO = userDao.selectCommunity(administratorsUserVO.getCommunityId());
        if (nonNull(comActVO)) {
@@ -1297,6 +1297,7 @@
            }
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            sysRoleDO.setRoleId(Snowflake.getId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert > 0) {
                SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1316,6 +1317,7 @@
            sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            sysRoleDO.setRoleId(Snowflake.getId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert > 0) {
                SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1414,10 +1416,10 @@
            }
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            SysRoleDO sysRoleDO1 = roleDAO.selectOne(
            List<SysRoleDO> sysRoleDO1 = roleDAO.selectList(
                    new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
            if (sysRoleDO1 != null) {
                sysRoleDO = sysRoleDO1;
            if (sysRoleDO1 != null && sysRoleDO1.size()>0 ) {
                sysRoleDO = sysRoleDO1.get(0);
                roleId = sysRoleDO.getRoleId();
            } else {
                roleDAO.insert(sysRoleDO);