Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

CeDo

2021-06-04 eb3920d7d07bbe8c85ef41c0b7f05fb4073d6226

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -246,6 +246,13 @@
                eventTransferRecordVOS.add(eventTransferRecordVO);
            }
            eventDetailsVO.setTrans(eventTransferRecordVOS);

            //查询事件发布人头像
            String imageUrl = eventMapper.getGridMemberImageUrl(eventDO.getGridMemberId());
            if(StringUtils.isNotEmpty(imageUrl)){
                eventDetailsVO.setGridMemberImageUrl(imageUrl);
            }

            return R.ok(eventDetailsVO);
        }
        return R.fail();
@@ -465,7 +472,7 @@
            return R.fail("查询社区错误");
        }
        ComActVO comActVO= JSONObject.parseObject(JSONObject.toJSONString(r.getData()),ComActVO.class);
        if(comActVO!=null){
        if(comActVO==null){
            return R.fail("社区不存在");
        }
        eventDO.setCommunityProcess(1);    //社区处理