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

huanghongfa

2021-09-26 a1488b8f2dfe014d3fa8badadd74bdee41d4bb66

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

@@ -61,7 +61,7 @@
                    this.comActFourMemberDao.insert(comActFourMember);
                    return R.ok();
                }
                return R.fail(r.getMsg());
                return R.fail("手机号或账户已存在");
            }
            return R.fail("绑定管辖区域不能为空或重复");
        }
@@ -73,15 +73,13 @@
        if(comActFourMemberVO!=null){
            if(comActFourMemberVO.getIds()!=null){
                for(Integer id:comActFourMemberVO.getIds()){
                    ComActFourMember comActFourMember=new ComActFourMember();
                    AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                    ComActFourMember comActFourMemberBase=this.comActFourMemberDao.selectById(id);
                    if(comActFourMemberBase!=null){
                        comActFourMember.setId(comActFourMemberBase.getId());
                        comActFourMember.setUserId(comActFourMemberBase.getUserId());
                        comActFourMemberVO.setUserId(comActFourMemberBase.getUserId());
                        BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
                        userService.putUserBackstage(administratorsUserVO);
                    }
                    AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                    BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
                    userService.putUserBackstage(administratorsUserVO);
                }
                return R.ok();
            }