|
@ -6372,7 +6372,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
if (deptId == null || deptId == 0l || deptId == 1175270520603930625l){ |
|
|
if (deptId == null || deptId == 0l || deptId == 1175270520603930625l){ |
|
|
lambdaQueryWrapper.and(wrap->wrap.eq(ItemHotlineEntity::getStreetId,'0').or().isNull(ItemHotlineEntity::getStreetId).or().eq(ItemHotlineEntity::getBackItemFlag,"1")); |
|
|
lambdaQueryWrapper.and(wrap->wrap.eq(ItemHotlineEntity::getStreetId,'0').or().isNull(ItemHotlineEntity::getStreetId).or().eq(ItemHotlineEntity::getBackItemFlag,"1")); |
|
|
}else{ |
|
|
}else{ |
|
|
lambdaQueryWrapper.and(wrap ->wrap.eq(ItemHotlineEntity::getStreetId,deptId)); |
|
|
lambdaQueryWrapper.and(wrap ->wrap.eq(ItemHotlineEntity::getStreetId,deptId)).ne(ItemHotlineEntity::getBackItemFlag,"1"); |
|
|
} |
|
|
} |
|
|
// 过滤掉退件的
|
|
|
// 过滤掉退件的
|
|
|
lambdaQueryWrapper.and(wrap->wrap.ne(ItemHotlineEntity::getBackFlag,"1").or().isNull(ItemHotlineEntity::getBackFlag)); |
|
|
lambdaQueryWrapper.and(wrap->wrap.ne(ItemHotlineEntity::getBackFlag,"1").or().isNull(ItemHotlineEntity::getBackFlag)); |
|
|