Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 bb3031392eb33434f67b6f37e08df72547a510ed

Merge branch 'test_screen' into 'master'

修改bug

See merge request root/zhihuishequ!53

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

@@ -960,6 +960,7 @@

        //查询事件播报模块数据
        EventNewStatisticsVO newStatisticsVO = this.baseMapper.getEventScreenRightTop(communityId);
        if(newStatisticsVO != null){
        //查询事件资源文件
        List<EventResourceDO> eventResourceDOList =
                eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
@@ -991,6 +992,7 @@
        newStatisticsVO.setAudios(audioList);
        newStatisticsVO.setPics(picList);
        newStatisticsVO.setVideos(videoList);
        }
        statisticsVO.setNewStatisticsVO(newStatisticsVO);

        //查询网格数据