From 5732a443720362a5800abe280ff9540b00da58f5 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 6 Jun 2025 09:52:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(sip):=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=B7=A5=E4=BD=9C=E8=BF=9B=E5=BA=A6=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 ProjectInfoServiceImpl 中项目工作进度列表的过滤条件
- 优化 ProjectWorkProgressServiceImpl 中的批量插入逻辑
- 引入 CollUtil 工具类进行集合判断，提高代码可读性
---
 .../com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java   | 2 +-
 .../sip/service/impl/ProjectWorkProgressServiceImpl.java     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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<ProjectWorkProgress> 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<ProjectWorkProgress> projectWorkProgressList) {
+        if (CollUtil.isEmpty(projectWorkProgressList)) {
+            return;
+        }
         projectWorkProgressMapper.insertIgnoreBatch(projectWorkProgressList);
     }
 }