|
@@ -479,15 +479,18 @@ public class AssembleAggregate {
|
|
retList.add(o);
|
|
retList.add(o);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
} else {
|
|
} else {
|
|
List<String> standNames = new ArrayList<>(subMap.get(hisDetailName).keySet());
|
|
List<String> standNames = new ArrayList<>(subMap.get(hisDetailName).keySet());
|
|
- for (String stdName : standNames) {
|
|
|
|
- T o = (T) item.getClass().newInstance();
|
|
|
|
- BeanUtil.copyProperties(item, o);
|
|
|
|
- Method setUniqueName = o.getClass().getMethod("setUniqueName", String.class);
|
|
|
|
- setUniqueName.invoke(o, stdName);
|
|
|
|
- retList.add(o);
|
|
|
|
|
|
+ if (ListUtil.isNotEmpty(standNames)) {
|
|
|
|
+ for (String stdName : standNames) {
|
|
|
|
+ T o = (T) item.getClass().newInstance();
|
|
|
|
+ BeanUtil.copyProperties(item, o);
|
|
|
|
+ Method setUniqueName = o.getClass().getMethod("setUniqueName", String.class);
|
|
|
|
+ setUniqueName.invoke(o, stdName);
|
|
|
|
+ retList.add(o);
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ retList.add(item);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|