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 efdb6c97..2b337a9d 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 @@ -617,17 +617,17 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { } } List teamNumList = materialMachineMapper.getTeamNumList(bean); - for (MaterialRetainedTeamTotalVo materialRetainedEquipmentInfo : teamNumList) { - // 根据班组名称查询分包单位 - String subUnitName = iwsTeamUserMapper.getTeamName(materialRetainedEquipmentInfo.getTeamName()); - materialRetainedEquipmentInfo.setSubUnitName(subUnitName); - } - if(bean.getSubUnitName()!=null && !bean.getSubUnitName().equals("") && !teamNumList.isEmpty()){ - // 根据传入的SubUnitName过滤列表 - teamNumList = teamNumList.stream() - .filter(item -> StringUtils.equals(item.getSubUnitName(), bean.getSubUnitName())) - .collect(Collectors.toList()); - } +// for (MaterialRetainedTeamTotalVo materialRetainedEquipmentInfo : teamNumList) { +// // 根据班组名称查询分包单位 +// String subUnitName = iwsTeamUserMapper.getTeamName(materialRetainedEquipmentInfo.getTeamName()); +// materialRetainedEquipmentInfo.setSubUnitName(subUnitName); +// } +// if(bean.getSubUnitName()!=null && !bean.getSubUnitName().equals("") && !teamNumList.isEmpty()){ +// // 根据传入的SubUnitName过滤列表 +// teamNumList = teamNumList.stream() +// .filter(item -> StringUtils.equals(item.getSubUnitName(), bean.getSubUnitName())) +// .collect(Collectors.toList()); +// } if (!hasSpecialRole) { if (CollectionUtil.isNotEmpty(iwsTeamUserVos)) { if (CollectionUtil.isNotEmpty(teamNumList)) { @@ -649,6 +649,8 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { } return teamNumList; } + + // public List getTeamNumList(MaterialRetainedEquipmentInfo bean) { // String username = SecurityUtils.getLoginUser().getUsername(); // // 根据用户名查询项目部信息