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

lidongdong

2023-07-05 6fd46263a21f0a4fa536d383dc4483d67cd393ef

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

@@ -1297,10 +1297,11 @@
            }
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            sysRoleDO.setRoleId(Snowflake.getId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert > 0) {
                SysRoleDO sysRoleDO1 = roleDAO.selectOne(
                        new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
                        new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
                roleId = sysRoleDO1.getRoleId();
                // 新角色设置所有权限
                MenuRoleVO menuRoleVO = new MenuRoleVO();
@@ -1316,10 +1317,11 @@
            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(
                        new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
                        new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
                roleId = sysRoleDO1.getRoleId();
                // 新街道管理员角色设置固定三社权限
                MenuRoleVO menuRoleVO = new MenuRoleVO();
@@ -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);