From 2f81f01a93e4384b2c17378aeb991938fc356cb4 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 18 六月 2021 16:22:08 +0800
Subject: [PATCH] bug-416-【后端-宣传教育 】后端新增的宣传教育发布成功，在app上分配的网格员昵称和头像不正确，在后端修改了网格员的头像和昵称也未同步
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 4abfaf0..f19c430 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
@@ -28,10 +28,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author cedoo
@@ -234,10 +231,16 @@
eventDetailsVO.setTrans(eventTransferRecordVOS);
//查询网格员头像,姓名
- 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());
+ Map<String,Object> gridMember = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
+ if (!CollectionUtils.isEmpty(gridMember)) {
+ eventDetailsVO.setGridMemberName(gridMember.get("name") == null ? "" : gridMember.get("name").toString());
+ eventDetailsVO.setGridMemberImageUrl(gridMember.get("image_url") == null ? "" : gridMember.get("image_url").toString());
+ }
+ if(Objects.equals(eventDO.getGridMemberId(),eventDO.getCreateBy())){
+ eventDetailsVO.setCreator(eventDetailsVO.getGridMemberName());
+ }else{
+ Map<String,Object> createUser = eventMapper.getUserBaseInfo(eventDO.getCreateBy());
+ eventDetailsVO.setCreator(createUser.get("name") == null ? "" : createUser.get("name").toString());
}
return R.ok(eventDetailsVO);
--
Gitblit v1.7.1