From 6ce74eb97e73d5cfd327e0b7042b7c7999d83ea5 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 18 六月 2021 14:29:39 +0800
Subject: [PATCH] bug-[409]-【后端-宣传教育 -查看详情】 创建人不正确
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index d7fff02..4abfaf0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -17,7 +17,6 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
-import com.panzhihua.service_grid.service.EventGridDataService;
import com.panzhihua.service_grid.service.EventResourceService;
import com.panzhihua.service_grid.service.EventService;
import com.panzhihua.service_grid.service.EventTransferRecordService;
@@ -25,12 +24,14 @@
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author cedoo
@@ -53,8 +54,6 @@
private EventGridDataMapper eventGridDataMapper;
@Resource
private EventGridMemberRelationMapper eventGridMemberRelationMapper;
- @Resource
- private EventGridDataService eventGridDataService;
/**
* 分页查找事件
@@ -234,10 +233,11 @@
}
eventDetailsVO.setTrans(eventTransferRecordVOS);
- //查询事件发布人头像
- String imageUrl = eventMapper.getGridMemberImageUrl(eventDO.getGridMemberId());
- if (StringUtils.isNotEmpty(imageUrl)) {
- eventDetailsVO.setGridMemberImageUrl(imageUrl);
+ //查询网格员头像,姓名
+ Map<String,Object> userBaseInfoMap = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
+ if (!CollectionUtils.isEmpty(userBaseInfoMap)) {
+ eventDetailsVO.setCreator(userBaseInfoMap.get("name") == null ? "" : userBaseInfoMap.get("name").toString());
+ eventDetailsVO.setGridMemberImageUrl(userBaseInfoMap.get("image_url") == null ? "" : userBaseInfoMap.get("image_url").toString());
}
return R.ok(eventDetailsVO);
--
Gitblit v1.7.1