From 259b893309f8c06a22adc8455f44bcc486d796c7 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 30 Jul 2024 09:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev

---
 src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
index 846be5a..26ce42f 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
@@ -67,6 +67,12 @@
         if (param.getBsm() != null && !param.getBsm().isEmpty()) {
             queryWrapper.like(LotInfo::getXmc, param.getBsm());
         }
+        if (param.getDkmj()!=null){
+            queryWrapper.eq(LotInfo::getDkmj,param.getDkmj());
+        }
+        if (param.getIsPlan() != null) {
+            queryWrapper.eq(LotInfo::getIsPlan, param.getIsPlan());
+        }
 
         // 执行分页查询
         Page<LotInfo> resultPage = mapper.selectPage(page, queryWrapper);

--
Gitblit v1.9.3