From 1738f12bdd3f0c4b76a71b86ae78721e0c0be74a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 27 Feb 2026 14:23:59 +0800
Subject: [PATCH] =?UTF-8?q?jeecg=E5=88=A4=E7=A9=BA=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/BmsInvoiceInfoMapper.xml |  6 +++---
 .../src/main/resources/mapper/BmsInvoiceListMapper.xml | 10 +++++-----
 .../resources/mapper/inventory/InventoryMapper.xml     |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mhd_bms/src/main/resources/mapper/BmsInvoiceInfoMapper.xml b/mhd_bms/src/main/resources/mapper/BmsInvoiceInfoMapper.xml
index 1e12d8390..1811f8b19 100644
--- a/mhd_bms/src/main/resources/mapper/BmsInvoiceInfoMapper.xml
+++ b/mhd_bms/src/main/resources/mapper/BmsInvoiceInfoMapper.xml
@@ -14,13 +14,13 @@
         <if test="tmsInvoiceInfoDTO.id !=null and tmsInvoiceInfoDTO.id != ''"> and a.id = #{tmsInvoiceInfoDTO.id} </if>
         <if test="tmsInvoiceInfoDTO.id!=null and tmsInvoiceInfoDTO.id!=''"> and instr(a.id ,#{tmsInvoiceInfoDTO.id}) > 0 </if>
         <if test="tmsInvoiceInfoDTO.createBy !=null and tmsInvoiceInfoDTO.createBy != ''"> and a.create_by = #{tmsInvoiceInfoDTO.createBy} </if>
-        <if test="@org.jeecg.common.util.oConvertUtils@isNotEmpty(tmsInvoiceInfoDTO.invoiceTitle)">
+        <if test="tmsInvoiceInfoDTO.invoiceTitle !=null and tmsInvoiceInfoDTO.invoiceTitle != ''">
             and a.invoice_title  LIKE  CONCAT('%',#{tmsInvoiceInfoDTO.invoiceTitle},'%')
         </if>
-        <if test="@org.jeecg.common.util.oConvertUtils@isNotEmpty(tmsInvoiceInfoDTO.taxRegAccount)">
+        <if test="tmsInvoiceInfoDTO.taxRegAccount !=null and tmsInvoiceInfoDTO.taxRegAccount != ''">
             and a.tax_reg_account  LIKE  CONCAT('%',#{tmsInvoiceInfoDTO.taxRegAccount},'%')
         </if>
-        <if test="@org.jeecg.common.util.oConvertUtils@isNotEmpty(tmsInvoiceInfoDTO.createByName)">
+        <if test="tmsInvoiceInfoDTO.createByName !=null and tmsInvoiceInfoDTO.createByName != ''">
             and a.create_by_name  LIKE  CONCAT('%',#{tmsInvoiceInfoDTO.createByName},'%')
         </if>
         <if test="tmsInvoiceInfoDTO.createTime!=null and tmsInvoiceInfoDTO.createTime!=''">
diff --git a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml
index 97c87bbd0..7e97e7332 100644
--- a/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml
+++ b/mhd_bms/src/main/resources/mapper/BmsInvoiceListMapper.xml
@@ -48,19 +48,19 @@
         <if test="bmsInvoiceListQueryDTO.sysOrgCode!=null and bmsInvoiceListQueryDTO.sysOrgCode!=''">
             and a.sys_org_code = #{bmsInvoiceListQueryDTO.sysOrgCode}
         </if>
-        <if test="@org.jeecg.common.util.oConvertUtils@isNotEmpty(bmsInvoiceListQueryDTO.applyNumber)">
+        <if test="bmsInvoiceListQueryDTO.applyNumber != null and bmsInvoiceListQueryDTO.applyNumber != ''">
             and a.apply_number LIKE CONCAT('%',#{bmsInvoiceListQueryDTO.applyNumber},'%')
         </if>
-        <if test="@org.jeecg.common.util.oConvertUtils@isNotEmpty(bmsInvoiceListQueryDTO.shipperName)">
+        <if test="bmsInvoiceListQueryDTO.shipperName != null and bmsInvoiceListQueryDTO.shipperName != ''">
             and a.shipper_name LIKE CONCAT('%',#{bmsInvoiceListQueryDTO.shipperName},'%')
         </if>
-          <if test="@org.jeecg.common.util.oConvertUtils@isNotEmpty(bmsInvoiceListQueryDTO.shipperId)">
+        <if test="bmsInvoiceListQueryDTO.shipperId != null and bmsInvoiceListQueryDTO.shipperId != ''">
             and a.shipper_id = #{bmsInvoiceListQueryDTO.shipperId}
         </if>
-        <if test="@org.jeecg.common.util.oConvertUtils@isNotEmpty(bmsInvoiceListQueryDTO.companyName)">
+        <if test="bmsInvoiceListQueryDTO.companyName != null and bmsInvoiceListQueryDTO.companyName != ''">
             and a.company_name LIKE CONCAT('%',#{bmsInvoiceListQueryDTO.companyName},'%')
         </if>
-         <if test="@org.jeecg.common.util.oConvertUtils@isNotEmpty(bmsInvoiceListQueryDTO.invoiceTitle)">
+        <if test="bmsInvoiceListQueryDTO.invoiceTitle != null and bmsInvoiceListQueryDTO.invoiceTitle != ''">
             and a.invoice_title LIKE CONCAT('%',#{bmsInvoiceListQueryDTO.invoiceTitle},'%')
         </if>
         <if test="bmsInvoiceListQueryDTO.organizationId != null ">
diff --git a/mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml b/mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml
index f2073d406..9b199f4f8 100644
--- a/mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml
+++ b/mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml
@@ -80,7 +80,7 @@
       <if test="query.codeManaged != null and query.codeManaged != ''">
           AND m.code_managed = #{query.codeManaged}
       </if>
-      <if test="query.createdAtStart != null and query.createdAtEnd != null and @org.jeecg.common.util.oConvertUtils@isNotEmpty(query.createdAtStart) and @org.jeecg.common.util.oConvertUtils@isNotEmpty(query.createdAtEnd)">
+      <if test="query.createdAtStart != null and query.createdAtEnd != null and query.createdAtStart != '' and query.createdAtEnd != ''">
           and  DATE_FORMAT(i.created_at,'%Y-%m-%d') <![CDATA[>=]]>  DATE_FORMAT(#{query.createdAtStart},'%Y-%m-%d')
           and  DATE_FORMAT(i.created_at,'%Y-%m-%d') <![CDATA[<=]]>  DATE_FORMAT(#{query.createdAtEnd},'%Y-%m-%d')
       </if>
@@ -118,4 +118,4 @@
     ORDER BY i.updated_at DESC
   </select>
 
-</mapper>
+</mapper>
\ No newline at end of file