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

lidongdong

2023-07-05 c20f18b987d597b04e110665c57c0cc6eb796525

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

 springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java

@@ -55,16 +55,25 @@
    @PostMapping("community")
    @OperLog(operModul = "社区管理", operType = 1)
    public R addCommunity(@Validated(AddGroup.class) @RequestBody ComActVO comActVO) {
        comActVO.setAppId(getAppId());
        R r = communityService.addCommunity(comActVO);
        if (R.isOk(r)) {
            ComActVO comActVO1 = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
            Long communityId = comActVO1.getCommunityId();
//        comActVO.setAppId(getAppId());
//        R r = communityService.addCommunity(comActVO);
//        if (R.isOk(r)) {
//            ComActVO comActVO1 = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), ComActVO.class);
//            Long communityId = comActVO1.getCommunityId();
//            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
//            administratorsUserVO.setAccount(comActVO1.getAccount());
//            administratorsUserVO.setPassword(comActVO.getPassword());
//            administratorsUserVO.setName(comActVO1.getContacts());
//            administratorsUserVO.setStatus(comActVO1.getState() + 1);


            Long communityId = 1676409638368608257L;
            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
            administratorsUserVO.setAccount(comActVO1.getAccount());
            administratorsUserVO.setAccount(comActVO.getAccount());
            administratorsUserVO.setPassword(comActVO.getPassword());
            administratorsUserVO.setName(comActVO1.getContacts());
            administratorsUserVO.setStatus(comActVO1.getState() + 1);
            administratorsUserVO.setName(comActVO.getContacts());
            administratorsUserVO.setStatus(comActVO.getState() + 1);


            administratorsUserVO.setType(3);
            administratorsUserVO.setAreaId(null);
@@ -75,22 +84,22 @@

            R r1 = userService.addUserBackstage(administratorsUserVO);

            if (!R.isOk(r1)) {
                userService.deleteUserBackstage(administratorsUserVO);
                communityService.delectCommunity(communityId);
            }

            if(R.isOk(r1))
            {
                addType(communityId,"资金公开");
                addType(communityId,"资产公开");
                addType(communityId,"资源公开");
                addType(communityId,"村集体经济组织项目");
            }
//            if (!R.isOk(r1)) {
//                userService.deleteUserBackstage(administratorsUserVO);
//                communityService.delectCommunity(communityId);
//            }
//
//            if(R.isOk(r1))
//            {
//                addType(communityId,"资金公开");
//                addType(communityId,"资产公开");
//                addType(communityId,"资源公开");
//                addType(communityId,"村集体经济组织项目");
//            }

            return r1;
        }
        return r;
//        }
//        return r;
    }



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

@@ -1344,9 +1344,9 @@
            {
                int insert = roleDAO.insert(sysRoleDO);
                if (insert > 0) {
                    SysRoleDO sysRoleDO1 = roleDAO.selectOne(
                            new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
                    roleId = sysRoleDO1.getRoleId();
//                    SysRoleDO sysRoleDO1 = roleDAO.selectOne(
//                            new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
                    roleId = sysRoleDOSelext.getRoleId();
                    // 新街道管理员角色设置固定三社权限
                    MenuRoleVO menuRoleVO = new MenuRoleVO();
                    List<Long> menu = new ArrayList<>();