采购合同变更

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -116,9 +116,9 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
         wrapper.ne(EhsdPurchase::getStatus, FlowStatusEnum1.UPDATE.getKey());
 
         //不显示 在审批中 但是 有历史合同id的数据
-        wrapper.and(q->q
-                .ne(EhsdPurchase::getStatus, FlowStatusEnum1.UNDER_REVIEW.getKey())
-                .isNull("t1.old_purchase_id")
+        wrapper.not(q->q
+                .eq(EhsdPurchase::getStatus, FlowStatusEnum1.UNDER_REVIEW.getKey())
+                .isNotNull("t1.old_purchase_id")
         );
 
         Page<EhsdPurchaseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);