Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH
This commit is contained in:
+2
-2
@@ -85,7 +85,7 @@ public class ComparisonUtil<T> {
|
||||
for (T oldObj : oldList) {
|
||||
String oldId = idField.get(oldObj).toString();
|
||||
if (oldId.equals(id.toString())) {
|
||||
resList.addAll(comparisonCertRecord(otaId, otaModuleEnum, tableTitle, newObj, oldObj, sysDictService));
|
||||
resList.addAll(comparisonCertRecord(otaId, otaModuleEnum, tableTitle, oldObj, newObj, sysDictService));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -148,7 +148,7 @@ public class ComparisonUtil<T> {
|
||||
if (ObjectUtils.isNotEmpty(newVal)) {
|
||||
Field tableField = newClazz.getClass().getDeclaredField(tableTitle);
|
||||
tableField.setAccessible(true);
|
||||
Object newTitleVal = tableField.get(newVal);
|
||||
Object newTitleVal = tableField.get(newClazz);
|
||||
if (ObjectUtils.isNotEmpty(newTitleVal)) {
|
||||
newTitleStr = newTitleVal.toString();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user