瀏覽代碼

转入转出报错修改

rengb 5 年之前
父節點
當前提交
a5240eeb6f
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfTransferRecordDocTrans.java

+ 6 - 2
trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfTransferRecordDocTrans.java

@@ -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);