补充

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

@@ -6382,9 +6382,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                                 .isNull(ItemHotlineEntity::getBackItemFlag));
             }
             // 过滤掉退件的
-            lambdaQueryWrapper.and(wrap->wrap.ne(ItemHotlineEntity::getBackFlag,"1").or().isNull(ItemHotlineEntity::getBackFlag));
+            lambdaQueryWrapper.and(wrap->wrap.ne(ItemHotlineEntity::getBackFlag,"1").or().isNull(ItemHotlineEntity::getBackFlag)).eq(ItemHotlineEntity::getYgzFlag,"1");
             // 新增筛选 是否是市里驳回重办件
-            lambdaQueryWrapper.eq(ItemHotlineEntity::getCbFlag,params.get("cbFlag")).eq(ItemHotlineEntity::getYgzFlag,"1");
+        String cbFlag = (String) params.get("cbFlag");
+        if(StringUtils.isNotBlank(cbFlag)){
+            lambdaQueryWrapper.eq(ItemHotlineEntity::getCbFlag,params.get("cbFlag"));
+        }
+
 //            lambdaQueryWrapper
 //                    .groupBy(ItemHotlineEntity::getSqid);
             lambdaQueryWrapper.orderByDesc(ItemHotlineEntity::getDjsj);