From 8d33e4df2aa8d5fce2ab4ebfd7309899538c2645 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 07 六月 2021 20:01:53 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 c1a6072..988398b 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
@@ -2001,7 +2001,7 @@
if (comActVO == null) {
return R.fail("社区不存在");
}
- EventDO eventDOInDB = this.getBaseMapper().selectById(commonEventDirectReportDTO.getEventId());
+ EventDO eventDOInDB = this.getBaseMapper().selectById(eventDO.getId());
eventDOInDB.setCommunityProcess(1); //社区处理
eventDOInDB.setProcessType(2); //当前处理对象： 社区处理
eventDOInDB.setCommunityProcess(1);
@@ -2014,7 +2014,7 @@
}
addTransferRecord(eventDO.getId(), commonEventDirectReportDTO.getToId(), comActVO.getName(), 2, commonEventDirectReportDTO.getProcessResult(),
commonEventDirectReportDTO.getUserId(), commonEventDirectReportDTO.getUserName(), 2);
- return R.ok();
+ return R.ok(eventDO.getId());
}
}
--
Gitblit v1.7.1