Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-04 e70053d772947e6e50cfa42f5a544a009699c4ac

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java

@@ -65,6 +65,11 @@
                        .lambda().eq(ComSwPatrolRecordReportDO::getPatrolRecordId,patrol.getId()));
                if(recordReportDO != null){
                    patrol.setServiceId(recordReportDO.getReportId());
                    if (null != comSwDangerReportDAO.selectById(recordReportDO.getReportId())) {
                        patrol.setDangerOrRecord(1);
                    }else{
                        patrol.setDangerOrRecord(2);
                    }
                }
            });
        }