From e6cad457062a884ad89a89b9fa937d19c5d6a94f Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Tue, 30 May 2023 19:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E4=BD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/controller/admin/recharge/vo/PromoterDrawReqVO.java  | 2 +-
 .../main/resources/mapper/recharge/RechargeOrderMapper.xml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java
index 1eced7a28..e75d140f4 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java
@@ -18,7 +18,7 @@ public class PromoterDrawReqVO extends PageParam {
 
     private Long tenantId;
 
-    @Schema(description = "组织名称")
+    @Schema(description = "商户名称")
     private String deptName;
     @Schema(description = "组织结构名称")
     private String parentOrganizationName;
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
index 63af8496c..fb2986d61 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
@@ -40,10 +40,10 @@
             <if test="data.nickname!=null and data.nickname!=''">
                 and d.nickname=#{data.nickname}
             </if>
-            <if test="data.createTime !=null ">
+            <if test="data.createTime !=null and data.createTime.length>=1">
                 and a.create_time &gt;=#{data.createTime[0]}
             </if>
-            <if test="data.createTime !=null ">
+            <if test="data.createTime !=null and data.createTime.length>=2">
                 and a.create_time &lt;=#{data.createTime[1]}
             </if>
         </where>