wangtong 1 éve
szülő
commit
acc1d7285f

+ 4 - 0
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZMaterialStatisticsServiceImpl.java

@@ -22,6 +22,7 @@ import com.ruoyi.zdsz.domain.vo.ZMaterialStatisticsVo;
 import com.ruoyi.zdsz.domain.ZMaterialStatistics;
 import com.ruoyi.zdsz.mapper.ZMaterialStatisticsMapper;
 import com.ruoyi.zdsz.service.IZMaterialStatisticsService;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -106,6 +107,8 @@ public class ZMaterialStatisticsServiceImpl implements IZMaterialStatisticsServi
         if (item2.getzEngineeringInfoBo().getzEngineeringMaterialBo().size()>0)
         {
             item2.getzEngineeringInfoBo().getzEngineeringMaterialBo().stream().forEach(item->{
+                if (!ObjectUtils.isEmpty(item))
+                {
                 LambdaQueryWrapper<ZMaterialStatistics> lqw = Wrappers.lambdaQuery();
                 lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZMaterialStatistics::getAreaId, bo.getAreaId());
                 lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZMaterialStatistics::getBuildingId, bo.getBuildingId());
@@ -128,6 +131,7 @@ public class ZMaterialStatisticsServiceImpl implements IZMaterialStatisticsServi
                     zMaterialStatistics1.setEnginCycle(bo.getEnginCycle());
                     baseMapper.insert(zMaterialStatistics1);
                 }
+                }
 
             });
         }