From 758663adf9cbd4e5b685e5fc950e677767b96102 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Fri, 19 Jul 2024 08:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E6=88=90=E5=88=A4=E6=96=AD=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zc/business/service/impl/DcWarningServiceImpl.java   | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
index c2a14751..d63aadf7 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java
@@ -408,6 +408,15 @@ public class DcWarningServiceImpl implements IDcWarningService
 //        return dcWarningMapper.insertDcWarning(dcWarning);//如果没有配置策略直接加入数据库;
 //    }
     private  JSONObject mergeJsonObjects(JSONObject jsonObjectOne, JSONObject jsonObjectTwo){
+        if(jsonObjectOne!=null&&jsonObjectTwo==null){
+            return jsonObjectOne; //两个存在一个为空返回不为空的
+        }
+        if (jsonObjectOne==null&&jsonObjectTwo!=null){
+            return jsonObjectTwo;//两个存在一个为空返回不为空的
+        }
+        if(jsonObjectOne==null&&jsonObjectTwo==null){
+            return new JSONObject();//两个都为空返回空json
+        }
         // 合并videoList
         if (jsonObjectTwo.has("videoList")) {
             JSONArray videoListTwo = jsonObjectTwo.getJSONArray("videoList");