From 2d63eeb6a091cc8ea68c843de1724a6db58340d6 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 08 六月 2021 17:32:10 +0800
Subject: [PATCH] Default Changelist
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 dfacfa7..ef11a5c 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
@@ -1180,6 +1180,11 @@
eventVO.setAudios(audioList);
eventVO.setPics(picList);
eventVO.setVideos(videoList);
+ //查询网格员头像
+ String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
+ if (StringUtils.isNotEmpty(imageUrl)) {
+ eventVO.setGridMemberImageUrl(imageUrl);
+ }
});
return R.ok(ipage);
}
@@ -1505,9 +1510,9 @@
.eq(EventTransferRecordDO::getEventId, eventId)
.orderByDesc(EventTransferRecordDO::getCreateAt)
);
- EventTransferRecordDO lastRecord = list.get(0);
EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
- if (list != null || list.size() > 0) {
+ if (list != null && list.size() > 0) {
+ EventTransferRecordDO lastRecord = list.get(0);
eventTransferRecordDO.setFromType(lastRecord.getToType());
eventTransferRecordDO.setFromId(lastRecord.getToId());
eventTransferRecordDO.setFromName(lastRecord.getToName());
@@ -1644,7 +1649,7 @@
public R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO) {
Page page = new Page(pageEventGridNearbyDTO.getPageNum(), pageEventGridNearbyDTO.getPageSize());
String latLng = pageEventGridNearbyDTO.getHappentLatLng();
- if(!latLng.matches("^[\\-\\+]?((0|([1-8]\\d?))(\\.\\d{1,10})?|90(\\.0{1,10})?),[\\-\\+]?(0(\\.\\d{1,10})?|([1-9](\\d)?)(\\.\\d{1,10})?|1[0-7]\\d{1}(\\.\\d{1,10})?|180\\.0{1,10})$")){
+ if(!latLng.matches("^[\\-\\+]?(0(\\.\\d{1,10})?|([1-9](\\d)?)(\\.\\d{1,10})?|1[0-7]\\d{1}(\\.\\d{1,10})?|180\\.0{1,10}),[\\-\\+]?((0|([1-8]\\d?))(\\.\\d{1,10})?|90(\\.0{1,10})?)$")){
return R.fail("经纬度参数错误");
}
String latLngArr[] = latLng.split(",");
--
Gitblit v1.7.1