bugfixed

CeDo

2021-06-05 b73ca75cae9d716a9d03ba6d66fdbe2faec5e9f9

bugfixed

 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);//交给网格员处理-验证