Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into dev

101captain

2022-02-25 caefe9a9cc486247f831e46356b0b03ca450fdf9

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

@@ -171,11 +171,9 @@
     */
    @Override
    public R<EventDetailsVO> eventDetails(Long id) {
        EventDO eventDO = eventMapper.selectById(id);
        if (eventDO != null) {
            EventDetailsVO eventDetailsVO = new EventDetailsVO();
            BeanUtils.copyProperties(eventDO, eventDetailsVO);
            EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
        EventDetailsVO eventDetailsVO = eventMapper.getById(id);
        if (eventDetailsVO != null) {
            EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDetailsVO.getGridId());
            if (eventGridDataDO != null) {
                eventDetailsVO.setGridName(eventGridDataDO.getGridName());
                eventDetailsVO.setCommunityId(eventGridDataDO.getGridCommunityId());
@@ -253,17 +251,17 @@
            eventDetailsVO.setTrans(eventTransferRecordVOS);

            // 查询网格员头像,姓名
            Map<String, Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
            Map<String, Object> gridMember = eventMapper.getUserBaseInfo(eventDetailsVO.getGridMemberId());
            if (!CollectionUtils.isEmpty(gridMember)) {
                eventDetailsVO.setGridMemberName(
                    gridMember.get("nick_name") == null ? "" : gridMember.get("nick_name").toString());
                eventDetailsVO.setGridMemberImageUrl(
                    gridMember.get("image_url") == null ? "" : gridMember.get("image_url").toString());
            }
            if (Objects.equals(eventDO.getGridMemberId(), eventDO.getCreateBy())) {
            if (Objects.equals(eventDetailsVO.getGridMemberId(), eventDetailsVO.getCreateBy())) {
                eventDetailsVO.setCreator(eventDetailsVO.getGridMemberName());
            } else {
                Map<String, Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy());
                Map<String, Object> createUser = eventMapper.getUserBaseInfo(eventDetailsVO.getCreateBy());
                eventDetailsVO
                    .setCreator(createUser.get("nick_name") == null ? "" : createUser.get("nick_name").toString());
            }