Merge remote-tracking branch 'origin/four_member' into four_member

huanghongfa

2021-09-24 7a282d69e08d875a016975ea4b980bec98a9bab8

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActSocialOrgServiceImpl.java

@@ -53,6 +53,8 @@
            administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
            administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
            administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
            administratorsUserVO.setName(comActSocialOrgVO.getContactName());
            administratorsUserVO.setPhone(comActSocialOrgVO.getContactPhone());
            R r=userService.addUserBackstageProperty(administratorsUserVO);
            if(R.isOk(r)){
                comActSocialOrg.setUserId(Long.parseLong(r.getData().toString()));
@@ -60,6 +62,7 @@
                this.comActSocialOrgDao.insert(comActSocialOrg);
                return R.ok();
            }
            return R.fail(r.getMsg());
        }
        return R.fail();
    }
@@ -84,12 +87,9 @@
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comActSocialOrg.getUserId());
                administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
                R r=userService.deleteUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    this.comActSocialOrgDao.deleteById(id);
                    return R.ok();
                }
                return R.fail("账号删除失败");
                userService.deleteUserBackstage(administratorsUserVO);
                this.comActSocialOrgDao.deleteById(id);
                return R.ok();
            }
        }
        return R.fail("用户账号错误");