WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
wangzhijiang
2023-03-28 21:58:52 +08:00
parent bff1966d94 d653d493e6
commit 2f5e3f8342
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/utils/ComparisonUtil.java
+2 -2
View File
@@ -85,7 +85,7 @@ public class ComparisonUtil<T> {
for (T oldObj : oldList) { for (T oldObj : oldList) {
String oldId = idField.get(oldObj).toString(); String oldId = idField.get(oldObj).toString();
if (oldId.equals(id.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)) { if (ObjectUtils.isNotEmpty(newVal)) {
Field tableField = newClazz.getClass().getDeclaredField(tableTitle); Field tableField = newClazz.getClass().getDeclaredField(tableTitle);
tableField.setAccessible(true); tableField.setAccessible(true);
Object newTitleVal = tableField.get(newVal); Object newTitleVal = tableField.get(newClazz);
if (ObjectUtils.isNotEmpty(newTitleVal)) { if (ObjectUtils.isNotEmpty(newTitleVal)) {
newTitleStr = newTitleVal.toString(); newTitleStr = newTitleVal.toString();
} }