From 637d629073293703d3aa6b4e4a46387c859edcb1 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 31 Oct 2025 15:18:58 +0800 Subject: [PATCH] =?UTF-8?q?2025-10-31=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChangeManagementServiceImpl.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index 1df007f3..3d308aa4 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -701,15 +701,17 @@ public class ChangeManagementServiceImpl extends ServiceImpl plmChangeTeams = new ArrayList<>(); - for (String fai : data.getDelegateAccessList()) { - PlmChangeTeam teamData = new PlmChangeTeam(); - teamData.setSite(data.getSite()); - teamData.setOperatorId(fai); - teamData.setChangeNo(data.getChangeNo()); - teamData.setType("delegateAccess"); - plmChangeTeams.add(teamData); + if (!data.getDelegateAccessList().isEmpty()) { + for (String fai : data.getDelegateAccessList()) { + PlmChangeTeam teamData = new PlmChangeTeam(); + teamData.setSite(data.getSite()); + teamData.setOperatorId(fai); + teamData.setChangeNo(data.getChangeNo()); + teamData.setType("delegateAccess"); + plmChangeTeams.add(teamData); + } + changeManagementMapper.saveBatchChangeTeams(plmChangeTeams); } - changeManagementMapper.saveBatchChangeTeams(plmChangeTeams); // 删除再新增所选详情 changeManagementMapper.deleteChangeDetails(data); @@ -1388,6 +1390,10 @@ public class ChangeManagementServiceImpl extends ServiceImpl getSubmitBaseData(String site, String userName, String docNo) { // 1、获取当前登陆人的域控账号 SysUserEntity user = sysUserDao.selectOne(new QueryWrapper().eq("username", userName)); + if (user == null) { + log.error("未找到用户信息,username={}", userName); + throw new RuntimeException("未找到用户信息,username: " + userName); + } // 根据域控账号获取oa人员id List oaIds = sysUserDao.selectOaIdByAccount(user.getDomainControlAccount()); if (oaIds.isEmpty()) { @@ -2158,7 +2164,6 @@ public class ChangeManagementServiceImpl extends ServiceImpl mainData = new ArrayList<>(); List nodeDetails = changeManagementMapper.queryNodeDetails(data.getSite(), baseData.get("workflowId"), baseData.get("nodeId"), baseData.get("classificationNo")); - // 查出变更单相关表的数据 // 库存成本影响 ChangeCostImpactVo costImpact = changeManagementMapper.costImpactSearch(changeRequest); // TP&执行信息