From f5d13ee8be24c0fe6e5c64707e9f6213602a6f28 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 12 Aug 2024 14:24:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/item/service/impl/ItemServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index c36f997c6..c0ec113db 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/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 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));