From dfaf94edd2722d596d52013dfaddc686d9adf9a9 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 27 Aug 2025 10:06:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clz/service/impl/MaterialBackApplyInfoServiceImpl.java | 1 + .../material/clz/service/impl/MaterialLeaseInfoServiceImpl.java | 1 + .../material/clz/service/impl/MaterialMachineServiceImpl.java | 1 + 3 files changed, 3 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java index 531bcfd6..53798a42 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java @@ -92,6 +92,7 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) { backApplyInfo.setProjectIdList(projectIdList); } + backApplyInfo.setIdCard(null); } List list = materialBackInfoMapper.selectBackApplyInfoList(backApplyInfo); // 如果列表为空，直接返回空列表 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java index efe051a2..53f98f0f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java @@ -112,6 +112,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { if (!CollectionUtils.isEmpty(projectIdList)) { leaseApplyInfo.setProjectIdList(projectIdList); } + leaseApplyInfo.setIdCard(null); } List list = materialLeaseInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo); // 利用Stream API进行降序排序 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java index f98b9a75..9449018c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java @@ -327,6 +327,7 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { for (MaterialRetainedEquipmentInfo retainedEquipmentInfo : list) { MaterialRetainedEquipmentInfo info = new MaterialRetainedEquipmentInfo(); info.setTypeId(retainedEquipmentInfo.getTypeId()); + info.setTeamId(bean.getTeamId()); List teamUseNumDetailsList = materialMachineMapper.getTeamUseNumDetailsList(info); if (CollectionUtils.isNotEmpty(teamUseNumDetailsList)) { retainedEquipmentInfo.setModelList(teamUseNumDetailsList);