diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingServiceImpl.java index e870b28bd7699f0411d03c708421f6f1ef6bcc1d..3ae01b6cefd4f31e329c33213de278305c0e56a7 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingServiceImpl.java @@ -142,7 +142,7 @@ public class ErpMaterialPickingServiceImpl implements IErpMaterialPickingService lqw.eq(bo.getReceiveTime() != null, ErpMaterialPicking::getReceiveTime, bo.getReceiveTime()); lqw.eq(bo.getState() != null, ErpMaterialPicking::getState, bo.getState()); lqw.in(bo.getStateList() != null, ErpMaterialPicking::getState, bo.getStateList()); - lqw.in(!sysDeptList.isEmpty(), ErpMaterialPicking::getCreateDeptId, sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList())); + lqw.in(bo.getRepairFormId() == null && !sysDeptList.isEmpty(), ErpMaterialPicking::getCreateDeptId, sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList())); lqw.orderByDesc(BaseEntity::getCreateTime); return lqw; }