Commit e0482442 authored by 刘帅's avatar 刘帅

1.查询出库列表,如果查询报修单下出库单则不做数据权限控制

parent 73aa00d6
...@@ -142,7 +142,7 @@ public class ErpMaterialPickingServiceImpl implements IErpMaterialPickingService ...@@ -142,7 +142,7 @@ public class ErpMaterialPickingServiceImpl implements IErpMaterialPickingService
lqw.eq(bo.getReceiveTime() != null, ErpMaterialPicking::getReceiveTime, bo.getReceiveTime()); lqw.eq(bo.getReceiveTime() != null, ErpMaterialPicking::getReceiveTime, bo.getReceiveTime());
lqw.eq(bo.getState() != null, ErpMaterialPicking::getState, bo.getState()); lqw.eq(bo.getState() != null, ErpMaterialPicking::getState, bo.getState());
lqw.in(bo.getStateList() != null, ErpMaterialPicking::getState, bo.getStateList()); 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); lqw.orderByDesc(BaseEntity::getCreateTime);
return lqw; return lqw;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment