提交BUG

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java

@@ -2212,12 +2212,12 @@ public class SalaryManagementController {
 				taxmonth = SalaryTool.getfirstnextMo(salary_month+"-01 00:00:00");
 				taxmonth = SalaryTool.getfirstnextMo(salary_month+"-01 00:00:00");
 			}
 			}
 			gsmx.setTaxMonth(taxmonth);//税款所属月份
 			gsmx.setTaxMonth(taxmonth);//税款所属月份
-			gsmx.setCumZljy(zxf == null ? 0 : zxf.getChildrenedu());//累计子女教育
-			gsmx.setCumZfdklx(zxf == null ? 0 : zxf.getHouseloans());//累计住房贷款利息
-			gsmx.setCumZfzj(zxf == null ? 0 : zxf.getHouserents());//累计住房租金
-			gsmx.setCumSylr(zxf == null ? 0 : zxf.getSupportolder());//累计赡养老人
-			gsmx.setCumJxjy(zxf == null ? 0 : zxf.getContinueedu());//累计继续教育
-			gsmx.setCumZxfjkc(zxf == null ? 0 : zxf.getTotalmoney());//累计专项附加扣除
+			gsmx.setCumZljy(zxf == null ? 0 : (zxf.getChildrenedu() == null ? 0 : zxf.getChildrenedu()));//累计子女教育
+			gsmx.setCumZfdklx(zxf == null ? 0 : (zxf.getHouseloans() == null ? 0 : zxf.getHouseloans()));//累计住房贷款利息
+			gsmx.setCumZfzj(zxf == null ? 0 : (zxf.getHouserents() == null ? 0 : zxf.getHouserents()));//累计住房租金
+			gsmx.setCumSylr(zxf == null ? 0 : (zxf.getSupportolder() == null ? 0 : zxf.getSupportolder()));//累计赡养老人
+			gsmx.setCumJxjy(zxf == null ? 0 : (zxf.getContinueedu() == null ? 0 : zxf.getContinueedu()));//累计继续教育
+			gsmx.setCumZxfjkc(zxf == null ? 0 : (zxf.getTotalmoney() == null ? 0 : zxf.getTotalmoney()));//累计专项附加扣除
 			gsmx.setTaxType("工资薪金所得");//计税类型
 			gsmx.setTaxType("工资薪金所得");//计税类型
 			gsmx.setCurrentIncome(wages_payable);//本期收入  【应发工资】
 			gsmx.setCurrentIncome(wages_payable);//本期收入  【应发工资】
 				SbgjjAssoYjzd cuspde = sbgjjassoyjzdmapper.IndividualTotalsbgjj(gsus, orgcode, salary_month);
 				SbgjjAssoYjzd cuspde = sbgjjassoyjzdmapper.IndividualTotalsbgjj(gsus, orgcode, salary_month);