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

@@ -100,6 +100,12 @@
                eventVO.setAudios(audioList);
                eventVO.setPics(picList);
                eventVO.setVideos(videoList);

                //查询网格员头像
                String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
                if(StringUtils.isNotEmpty(imageUrl)){
                    eventVO.setGridMemberImageUrl(imageUrl);
                }
            });
            return R.ok(ipage);
        }
@@ -240,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();