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/ComActCommitteeServiceImpl.java

@@ -57,6 +57,7 @@
                this.comActCommitteeDao.insert(comActCommittee);
                return R.ok();
            }
            return R.fail(r.getMsg());
        }
        return R.fail();
    }
@@ -82,12 +83,10 @@
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comActCommittee.getUserId());
                administratorsUserVO.setCommunityId(comActCommittee.getCommunityId());
                R r=userService.deleteUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    this.comActCommitteeDao.deleteById(id);
                    return R.ok();
                }
                return R.fail("账号删除失败");
                userService.deleteUserBackstage(administratorsUserVO);
                this.comActCommitteeDao.deleteById(id);
                return R.ok();

            }
        }
        return R.fail("用户账号错误");