diff --git a/src/main/java/com/zhgd/xmgl/modules/cost/controller/IndexController.java b/src/main/java/com/zhgd/xmgl/modules/cost/controller/IndexController.java index 781fbb21d..38d614e8f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/cost/controller/IndexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/cost/controller/IndexController.java @@ -27,6 +27,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -160,7 +161,8 @@ public class IndexController { List projects = projectService.list(); int budgetRisk = 0; for (Project project : projects) { - List contractPayList = costContractPayList.stream().filter(c -> c.getSxm().equals(project.getProjectId().toString())).collect(Collectors.toList()); + List contractPayList = costContractPayList.stream().filter(c -> StringUtils.isNotBlank(c.getSxm()) + && c.getSxm().equals(project.getProjectId().toString())).collect(Collectors.toList()); List budgetList = costBudgetList.stream().filter(c -> c.getProjectSn().equals(project.getProjectSn())).collect(Collectors.toList()); if (budgetList.size() > 0) { BigDecimal pay = contractPayList.stream().map(c -> new BigDecimal(c.getSfje())).reduce(BigDecimal.ZERO, BigDecimal::add);