From 4c701a80d87a1721ca97b63762008605c740b5ae Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 04 六月 2021 18:24:18 +0800
Subject: [PATCH] 管理后台随手拍模块,网格模块

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 37abb85..ac8532d 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
@@ -49,6 +49,8 @@
     private EventTransferRecordService eventTransferRecordService;
     @Resource
     private CommunityService communityService;
+    @Resource
+    private EventGridDataMapper eventGridDataMapper;
 
 
     /**
@@ -162,6 +164,10 @@
                 eventDealStatus=6;//"已撤销"
             }
             eventDetailsVO.setEventDealStatus(eventDealStatus);
+
+            EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
+            eventDetailsVO.setGridName(eventGridDataDO.getGridName());
+
             //查询事件关联附件
             List<EventResourceDO> eventResourceDOList =
                     eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
@@ -466,7 +472,7 @@
             return R.fail("查询社区错误");
         }
         ComActVO comActVO= JSONObject.parseObject(JSONObject.toJSONString(r.getData()),ComActVO.class);
-        if(comActVO!=null){
+        if(comActVO==null){
             return R.fail("社区不存在");
         }
         eventDO.setCommunityProcess(1);    //社区处理

--
Gitblit v1.7.1