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

huanghongfa

2021-06-03 0a35a244f60da0d01a3a9142ed154fa9a83c4ad4

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

@@ -98,6 +98,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);
        }
@@ -234,6 +240,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();