From b7a06b6e93c0df03ed84c40385cbe88d27459d4f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 09 七月 2021 13:27:48 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 b897c46..3b82fcd 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
@@ -121,9 +121,10 @@
eventVO.setVideos(videoList);
//查询网格员头像
- String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
- if (StringUtils.isNotEmpty(imageUrl)) {
- eventVO.setGridMemberImageUrl(imageUrl);
+ Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
+ if (StringUtils.isNotEmpty(userMap)) {
+ eventVO.setGridMemberName(userMap.get("nick_name"));
+ eventVO.setGridMemberImageUrl(userMap.get("image_url"));
}
});
return R.ok(ipage);
@@ -1264,9 +1265,10 @@
eventVO.setPics(picList);
eventVO.setVideos(videoList);
//查询网格员头像
- String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
- if (StringUtils.isNotEmpty(imageUrl)) {
- eventVO.setGridMemberImageUrl(imageUrl);
+ Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
+ if (StringUtils.isNotEmpty(userMap)) {
+ eventVO.setGridMemberName(userMap.get("nick_name"));
+ eventVO.setGridMemberImageUrl(userMap.get("image_url"));
}
});
return R.ok(ipage);
@@ -1325,9 +1327,10 @@
eventVO.setVideos(videoList);
//查询网格员头像
- String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
- if (StringUtils.isNotEmpty(imageUrl)) {
- eventVO.setGridMemberImageUrl(imageUrl);
+ Map<String,String> userMap = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
+ if (StringUtils.isNotEmpty(userMap)) {
+ eventVO.setGridMemberName(userMap.get("nick_name"));
+ eventVO.setGridMemberImageUrl(userMap.get("image_url"));
}
});
return R.ok(ipage);
@@ -2198,7 +2201,8 @@
if(!specialPopulationVOIPage.getRecords().isEmpty()){
specialPopulationVOIPage.getRecords().forEach(specialPopulation -> {
try {
- specialPopulation.setAge(IdcardUtil.getAgeByIdCard(specialPopulation.getIdCard()));
+ Integer age = IdcardUtil.getAgeByIdCard(specialPopulation.getIdCard());
+ specialPopulation.setAge(age);
}catch (Exception e){
log.error("身份证号码转换年龄失败，人员id:" + specialPopulation.getId());
}
--
Gitblit v1.7.1