|
@@ -36,8 +36,12 @@ public class ShaoyfTransferRecordDocTrans extends ModelDocTrans {
|
|
|
List<Map<String, Object>> into = (List) contentMap.get("转入记录");
|
|
|
List<Map<String, Object>> out = (List) contentMap.get("转出记录");
|
|
|
List<Map<String, Object>> all = new ArrayList<>();
|
|
|
- all.addAll(into);
|
|
|
- all.addAll(out);
|
|
|
+ if (ListUtil.isNotEmpty(into)) {
|
|
|
+ all.addAll(into);
|
|
|
+ }
|
|
|
+ if (ListUtil.isNotEmpty(out)) {
|
|
|
+ all.addAll(out);
|
|
|
+ }
|
|
|
Map<String, TransferIntoDoc> transferIntoDocMap = getTransferIntoDocMap(into);
|
|
|
Map<String, TransferOutDoc> transferOutDocMap = getTransferOutDocMap(out);
|
|
|
Map<String, TransferRecordDoc> transferAllDocMap = getTransferAllDocMap(all);
|