Merge branch 'test' into 'four_member'

罗元桥

2021-09-24 09e41d546b030b47661877d4b8141c88584d7598

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

@@ -52,6 +52,9 @@
            administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
            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()));
@@ -59,34 +62,18 @@
                this.comActSocialOrgDao.insert(comActSocialOrg);
                return R.ok();
            }
            return R.fail(r.getMsg());
        }
        return R.fail();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R update(ComActSocialOrgVO comActSocialOrgVO) {
        if(comActSocialOrgVO!=null){
           if(!comActSocialOrgVO.getAccount().isEmpty()||!comActSocialOrgVO.getPassword().isEmpty()){
               AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
               administratorsUserVO.setUserId(comActSocialOrgVO.getUserId());
               administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
               administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
               R r=userService.putUserBackstage(administratorsUserVO);
               if(R.isOk(r)){
                   ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
                   BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
                   this.comActSocialOrgDao.updateById(comActSocialOrg);
                   return R.ok();
               }
               return R.fail("账号密码修改失败");
           }
           else {
               ComActSocialOrg comActSocialOrg=new ComActSocialOrg();
               BeanUtils.copyProperties(comActSocialOrgVO,comActSocialOrg);
               this.comActSocialOrgDao.updateById(comActSocialOrg);
               return R.ok();
           }
        }
        return R.fail();
    }
@@ -99,12 +86,10 @@
            if(comActSocialOrg.getUserId()!=null){
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setUserId(comActSocialOrg.getUserId());
                R r=userService.deleteUserBackstage(administratorsUserVO);
                if(R.isOk(r)){
                    this.comActSocialOrgDao.deleteById(id);
                    return R.ok();
                }
                return R.fail("账号删除失败");
                administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
                userService.deleteUserBackstage(administratorsUserVO);
                this.comActSocialOrgDao.deleteById(id);
                return R.ok();
            }
        }
        return R.fail("用户账号错误");