From 5688e9adb709a253e1ce69b510457b9c88a645a9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Sep 2021 16:39:18 +0800
Subject: [PATCH] screnn_api特殊设备实体类修改,走航车实时websocket,manage设备补偿

---
 screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java b/screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java
index 976444c..95d3716 100644
--- a/screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/CompareFieldUtils.java
@@ -64,11 +64,17 @@
                 CompareFieldResult result = new CompareFieldResult();
                 result.setFieldName(field.getName());
                 result.setFieldAnnoName(annotation.value());
-                result.setNewData(newDataObj.toString());
-                if(oldDataObj==null)
+
+                if(newDataObj.equals(""))
+                    result.setNewData("null");
+                else
+                    result.setNewData(newDataObj.toString());
+
+                if(oldDataObj==null||oldDataObj.equals(""))
                     result.setOldData("null");
                 else
                     result.setOldData(oldDataObj.toString());
+
                 results.add(result);
             }
         }catch (IntrospectionException e) {

--
Gitblit v1.8.0