From 1dea4bcbf1c29a1e0c949666acd34283ca737ccf Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 03 八月 2021 18:03:42 +0800
Subject: [PATCH] 防火防汛后台bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
index 6c8eaa7..e0a8e39 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwDangerReportServiceImpl.java
@@ -73,10 +73,10 @@
         IPage<ComSwDangerReportVO> iPage = comSwDangerReportDAO.pageDangerReport(page, comSwPatrolRecordPageDTO);
         if (!iPage.getRecords().isEmpty()) {
             iPage.getRecords().forEach(comSwDangerReportVO -> {
-                if (StringUtils.isNotEmpty(comSwDangerReportVO.getAssignPerson())) {
-                    comSwDangerReportVO.setIsAssign(ComSwDangerReportVO.isOk.no);
-                }else {
+                if (StringUtils.isNotEmpty(comSwDangerReportVO.getStatus()) && "2".equals(comSwDangerReportVO.getStatus())) {
                     comSwDangerReportVO.setIsAssign(ComSwDangerReportVO.isOk.yes);
+                }else {
+                    comSwDangerReportVO.setIsAssign(ComSwDangerReportVO.isOk.no);
                 }
                 StringBuilder patrolNameString = new StringBuilder();
                 StringBuilder patrolPhoneString = new StringBuilder();

--
Gitblit v1.7.1