Merge branch 'hemenkou_dev' into dev

101captain

2022-02-21 5a278a0965b417e7f39e8c209e2ff401f415066a

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

@@ -39,7 +39,7 @@

    @Override
    public R selectById(Long id) {
        return null;
        return R.ok(comActSocialOrgDao.detail(id));
    }

    @Override
@@ -52,8 +52,21 @@
            administratorsUserVO.setType(3);
            administratorsUserVO.setAccount(comActSocialOrgVO.getAccount());
            administratorsUserVO.setPassword(comActSocialOrgVO.getPassword());
            administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
            administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
            //根据roleId判断是普通社会组织还是定制三社
            if(comActSocialOrgVO.getRoleId()==null){
                administratorsUserVO.setSocialType(2);
                administratorsUserVO.setRoleId(777777777L);
                comActSocialOrg.setIsSociety(1);
            }
            else {
                administratorsUserVO.setRoleId(comActSocialOrgVO.getRoleId());
            }
            if(comActSocialOrg.getCommunityId()!=null){
                administratorsUserVO.setCommunityId(comActSocialOrg.getCommunityId());
            }
            if(comActSocialOrg.getStreetId()!=null){
                administratorsUserVO.setStreetId(comActSocialOrg.getStreetId());
            }
            administratorsUserVO.setName(comActSocialOrgVO.getContactName());
            administratorsUserVO.setPhone(comActSocialOrgVO.getContactPhone());
            R r=userService.addUserBackstageProperty(administratorsUserVO);