Commit c561d9d1 authored by yanzg's avatar yanzg

升级新版本

parent 4b8ef624
...@@ -30,6 +30,9 @@ public class DataDaoVo<T> { ...@@ -30,6 +30,9 @@ public class DataDaoVo<T> {
// 历史数据处理 // 历史数据处理
if (hisitories != null) { if (hisitories != null) {
for (T his : hisitories) { for (T his : hisitories) {
if (his == null) {
continue;
}
String key = keyFunc.getKey(his); String key = keyFunc.getKey(his);
mapHistory.put(key, his); mapHistory.put(key, his);
} }
...@@ -49,6 +52,9 @@ public class DataDaoVo<T> { ...@@ -49,6 +52,9 @@ public class DataDaoVo<T> {
// 返回集 // 返回集
if (nows != null) { if (nows != null) {
for (T now : nows) { for (T now : nows) {
if (now == null) {
continue;
}
String key = keyFunc.getKey(now); String key = keyFunc.getKey(now);
T his = mapHistory.get(key); T his = mapHistory.get(key);
if (his == null) { if (his == null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment