From a9cc2343ceaad3e99dc25eb036dc99aeded279a6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 20 Oct 2023 09:26:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
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