From fa884892aedd0a8f5f238f22037b439d73911006 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 22 Nov 2023 10:19:50 +0800
Subject: [PATCH] =?UTF-8?q?PC=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messagepushlog/MessagePushLogService.java | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java
index 96157e5e..fa97b576 100644
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java
@@ -229,16 +229,35 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
                 String createTime = "";
                 if ("数据消息".equals(type)) {
                     String thing2 = map.get("thing2");
-                    title = thing2;
+                    if(StringUtils.isNotBlank(thing2)){
+                        title = thing2;
+                    }else{
+                        title = "无";
+                    }
+
                     createTime = map.get("time1");
                 } else if ("风险提示".equals(type)) {
                     String thing3 = map.get("thing3");
                     String thing4 = map.get("thing4");
+                    if(StringUtils.isNotBlank(thing3) && StringUtils.isNotBlank(thing4)){
+                        title = thing3 + "-" + thing4;
+                    }else if(StringUtils.isNotBlank(thing3)){
+                        title = thing3;
+                    }else if(StringUtils.isNotBlank(thing4)){
+                        title = thing4;
+                    }else{
+                        title = "无";
+                    }
                     title = thing3 + "-" + thing4;
                     createTime = map.get("time5");
                 } else if ("设备状态".equals(type)) {
                     String thing3 = map.get("thing3");
-                    title = thing3;
+                    if(StringUtils.isNotBlank(thing3)){
+                        title = thing3;
+                    }else{
+                        title = "无";
+                    }
+
                     createTime = map.get("time4");
                 }
                 messagePushPcLogVo.setTitle(title);