diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java index 4afa65ef..bb31ead1 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java @@ -165,7 +165,7 @@ public class ProjectInfoServiceImpl implements IProjectInfoService { //插入变更记录信息 List projectWorkProgressList = projectInfo1.getProjectWorkProgressList(); if (CollUtil.isNotEmpty(projectWorkProgressList)) { - projectWorkProgressList = projectWorkProgressList.stream().filter(item -> item.getId() != null).collect(Collectors.toList()); + projectWorkProgressList = projectWorkProgressList.stream().filter(item -> item.getId() == null).collect(Collectors.toList()); for (ProjectWorkProgress workProgress : projectWorkProgressList) { workProgress.setProjectId(projectInfo1.getId()); workProgress.setWorkUser(ShiroUtils.getUserId().toString()); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectWorkProgressServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectWorkProgressServiceImpl.java index 4c365f45..318aff18 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectWorkProgressServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectWorkProgressServiceImpl.java @@ -2,6 +2,8 @@ package com.ruoyi.sip.service.impl; import java.util.Collections; import java.util.List; + +import cn.hutool.core.collection.CollUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.sip.mapper.ProjectWorkProgressMapper; @@ -100,6 +102,9 @@ public class ProjectWorkProgressServiceImpl implements IProjectWorkProgressServi @Override public void insertIgnoreBatch(List projectWorkProgressList) { + if (CollUtil.isEmpty(projectWorkProgressList)) { + return; + } projectWorkProgressMapper.insertIgnoreBatch(projectWorkProgressList); } }