完善搜索

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

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