lidongdong
2023-07-05 e2970b6e0050a480c799cb0aae255a9da04740b1
修改新增社区 不同区域同名字社区添加报错
2个文件已修改
46 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityApi.java
@@ -55,24 +55,24 @@
    @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();
//            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
//            administratorsUserVO.setAccount(comActVO1.getAccount());
//            administratorsUserVO.setPassword(comActVO.getPassword());
//            administratorsUserVO.setName(comActVO1.getContacts());
//            administratorsUserVO.setStatus(comActVO1.getState() + 1);
            Long communityId = 1676167509797011458L;
        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(comActVO.getAccount());
            administratorsUserVO.setAccount(comActVO1.getAccount());
            administratorsUserVO.setPassword(comActVO.getPassword());
            administratorsUserVO.setName(comActVO.getContacts());
            administratorsUserVO.setStatus(comActVO.getState() + 1);
            administratorsUserVO.setName(comActVO1.getContacts());
            administratorsUserVO.setStatus(comActVO1.getState() + 1);
//            Long communityId = 1676167509797011458L;
//            AdministratorsUserVO administratorsUserVO = new AdministratorsUserVO();
//            administratorsUserVO.setAccount(comActVO.getAccount());
//            administratorsUserVO.setPassword(comActVO.getPassword());
//            administratorsUserVO.setName(comActVO.getContacts());
//            administratorsUserVO.setStatus(comActVO.getState() + 1);
            administratorsUserVO.setType(3);
@@ -84,10 +84,10 @@
            R r1 = userService.addUserBackstage(administratorsUserVO);
//            if (!R.isOk(r1)) {
//                userService.deleteUserBackstage(administratorsUserVO);
//                communityService.delectCommunity(communityId);
//            }
            if (!R.isOk(r1)) {
                userService.deleteUserBackstage(administratorsUserVO);
                communityService.delectCommunity(communityId);
            }
//
//            if(R.isOk(r1))
//            {
@@ -98,8 +98,8 @@
//            }
            return r1;
//        }
//        return r;
        }
        return r;
    }
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -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(