From b73ca75cae9d716a9d03ba6d66fdbe2faec5e9f9 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 05 六月 2021 22:29:44 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 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 b06f50b..4fe732e 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
@@ -469,26 +469,6 @@
return R.fail("当前事件已交由社区处理");
}
-
- List<EventTransferRecordDO> list = eventTransferRecordService.getBaseMapper().selectList(new LambdaQueryWrapper<EventTransferRecordDO>()
- .eq(EventTransferRecordDO::getEventId, eventDO.getId())
- .orderByDesc(EventTransferRecordDO::getCreateAt)
- );
-
- Long reportToInDB = -1L;
- for (int i = 0; i < list.size(); i++) {
- EventTransferRecordDO eventTransferRecordDO = list.get(i);
- if(eventTransferRecordDO.getProcessType()!=null && eventTransferRecordDO.getProcessType()==2){
- reportToInDB = eventTransferRecordDO.getToId();
- }
- }
- if(commonEventReportDTO.getCommunityId()==null){
- return R.fail("当前用户社区获取失败");
- }
- if(reportToInDB.longValue() != commonEventReportDTO.getCommunityId().longValue()){
- return R.fail("用户上报的社区不是当前社区");
- }
-
R r = communityService.detailCommunity(commonEventReportDTO.getToId());
if(!R.isOk(r)){
return R.fail("社区不存在");
@@ -1324,6 +1304,24 @@
return R.fail("事件当前不是上报状态");
}
+ List<EventTransferRecordDO> list = eventTransferRecordService.getBaseMapper().selectList(new LambdaQueryWrapper<EventTransferRecordDO>()
+ .eq(EventTransferRecordDO::getEventId, eventDO.getId())
+ .orderByDesc(EventTransferRecordDO::getCreateAt)
+ );
+
+ Long reportToInDB = -1L;
+ for (int i = 0; i < list.size(); i++) {
+ EventTransferRecordDO eventTransferRecordDO = list.get(i);
+ if(eventTransferRecordDO.getProcessType()!=null && eventTransferRecordDO.getProcessType()==2){
+ reportToInDB = eventTransferRecordDO.getToId();
+ }
+ }
+ if(commonEventDealDTO.getCommunityId()==null){
+ return R.fail("当前用户社区获取失败");
+ }
+ if(reportToInDB.longValue() != commonEventDealDTO.getCommunityId().longValue()){
+ return R.fail("用户上报的社区不是当前社区");
+ }
if(commonEventDealDTO.getNeedVerify()){
eventDO.setEventProcessStatus(3);//待验证状态
eventDO.setProcessType(1);//交给网格员处理-验证
--
Gitblit v1.7.1