Procházet zdrojové kódy

fix: 积分包管理列表导出NPE

lixuesong před 1 rokem
rodič
revize
2325507d79

+ 12 - 8
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -371,10 +371,12 @@ public class WmPayOffController {
 				export.setSubType(subjectLocation.getDescription());
 				// 获取当前税源地的发票类目
 				Map<String, String> subInvoice = collect.get(subjectLocation.getInvoiceType());
-				// 根据发票类目value获取发票类目名称
-				String cate = String.valueOf(settleOutput.getInvoiceCategory());
-				String invoice = subInvoice.getOrDefault(cate, "") ;
-				export.setInvoiceCategory(invoice);
+				if (subInvoice != null) {
+					// 根据发票类目value获取发票类目名称
+					String cate = String.valueOf(settleOutput.getInvoiceCategory());
+					String invoice = subInvoice.getOrDefault(cate, "");
+					export.setInvoiceCategory(invoice);
+				}
 			}
 			export.setUserNames(settleOutput.getUserNames());
 			export.setSettleAmount(settleOutput.getSettleAmount());
@@ -432,10 +434,12 @@ public class WmPayOffController {
 				export.setSubType(subjectLocation.getDescription());
 				// 获取当前税源地的发票类目
 				Map<String, String> subInvoice = collect.get(subjectLocation.getInvoiceType());
-				// 根据发票类目value获取发票类目名称
-				String cate = String.valueOf(settleOutput.getInvoiceCategory());
-				String invoice = subInvoice.getOrDefault(cate, "") ;
-				export.setInvoiceCategory(invoice);
+				if (subInvoice != null) {
+					// 根据发票类目value获取发票类目名称
+					String cate = String.valueOf(settleOutput.getInvoiceCategory());
+					String invoice = subInvoice.getOrDefault(cate, "");
+					export.setInvoiceCategory(invoice);
+				}
 			}
 			export.setUserNames(settleOutput.getUserNames());
 			export.setSettleAmount(settleOutput.getSettleAmount());