袁少华 4 years ago
parent
commit
6d7096ebd2

+ 3 - 1
src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -439,7 +439,9 @@ public class FbsWorkingStatisticsController {
 		 BigDecimal allHors = new BigDecimal("0");
 		 BigDecimal allNum = new BigDecimal("0");
 		 for (FbsWorkingStatistics o:list1){
-			 allHors = allHors.add(o.getWorkingHours());
+			 if(o.getWorkingHours()!=null){
+				 allHors = allHors.add(o.getWorkingHours());
+			 }
 			 if(StringUtils.isNotBlank(o.getQualifiedNumber())){
 				 allNum = allNum.add(new BigDecimal(o.getQualifiedNumber()));
 			 }