linxk 1 tydzień temu
rodzic
commit
72ebd583b1

+ 8 - 8
cif-service/src/main/java/com/txz/cif/web/mng/SubjectController.java

@@ -191,10 +191,10 @@ public class SubjectController {
 					List<Object> rowA = CollUtil.newArrayList(temp.getAliases()
 							, temp.getName()
 							, temp.getDirection()
-							, temp.getInitAmount().toPlainString()
-							, temp.getDebitAmount().toPlainString()
-							, temp.getCreditAmount().toPlainString()
-							, temp.getEndAmount().toPlainString()
+							, temp.getInitAmount() == null? "0.0":temp.getInitAmount().toPlainString()
+							, temp.getDebitAmount()== null? "0.0":temp.getDebitAmount().toPlainString()
+							, temp.getCreditAmount()== null? "0.0":temp.getCreditAmount().toPlainString()
+							, temp.getEndAmount()== null? "0.0":temp.getEndAmount().toPlainString()
 					);
 					rows.add(rowA);
 					if (CollUtil.isNotEmpty(temp.getChildren())){
@@ -202,10 +202,10 @@ public class SubjectController {
 							List<Object> rowA2 = CollUtil.newArrayList(temp2.getAliases()
 									, temp2.getName()
 									, temp2.getDirection()
-									, temp2.getInitAmount().toPlainString()
-									, temp2.getDebitAmount().toPlainString()
-									, temp2.getCreditAmount().toPlainString()
-									, temp2.getEndAmount().toPlainString()
+									, temp2.getInitAmount() == null? "0.0":temp2.getInitAmount().toPlainString()
+									, temp2.getDebitAmount()== null? "0.0":temp2.getDebitAmount().toPlainString()
+									, temp2.getCreditAmount()== null? "0.0":temp2.getCreditAmount().toPlainString()
+									, temp2.getEndAmount()== null? "0.0":temp2.getEndAmount().toPlainString()
 							);
 							rows.add(rowA2);
 						}