From bf95c0c358727d502e59582a10f31c3a943a09ca Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 29 Dec 2023 11:10:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E6=97=A0=E6=B3=95=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/ext/ExtAppLogMapper.xml     | 8 +++++---
 .../src/views/panel/appTemplateMarket/log/FilterUser.vue  | 2 +-
 .../src/views/panel/appTemplateMarket/log/index.vue       | 8 +++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml
index d4a9b4c16b..bc8dbe8b84 100644
--- a/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml
+++ b/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml
@@ -66,9 +66,11 @@
             )
         </if>
         ) logInfo
-        <if test="applyTime != null and applyTime.length > 1">
-            and (apply_time between #{applyTime.[0]} and #{applyTime.[1]}
-        </if>
+        <where>
+            <if test="applyTime != null and applyTime.length > 1">
+                and (logInfo.apply_time between #{applyTime.[0]} and #{applyTime.[1]})
+            </if>
+        </where>
 
         <choose>
             <when test="orders!=null and orders.size > 0">
diff --git a/core/frontend/src/views/panel/appTemplateMarket/log/FilterUser.vue b/core/frontend/src/views/panel/appTemplateMarket/log/FilterUser.vue
index 02cae2e2ff..b5300a1fe1 100644
--- a/core/frontend/src/views/panel/appTemplateMarket/log/FilterUser.vue
+++ b/core/frontend/src/views/panel/appTemplateMarket/log/FilterUser.vue
@@ -92,7 +92,7 @@ export default {
           max = +max + 24 * 3600 * 1000
         }
         conditions.push({
-          field: 'apply_time',
+          field: 'applyTime',
           operator: 'between',
           value: [+min, +max]
         })
diff --git a/core/frontend/src/views/panel/appTemplateMarket/log/index.vue b/core/frontend/src/views/panel/appTemplateMarket/log/index.vue
index e95bfd403a..62c44f7ec7 100644
--- a/core/frontend/src/views/panel/appTemplateMarket/log/index.vue
+++ b/core/frontend/src/views/panel/appTemplateMarket/log/index.vue
@@ -420,11 +420,13 @@ export default {
         return
       }
       const param = {
-        orders: formatOrders(this.orderConditions),
-        conditions: [...this.cacheCondition]
+        orders: formatOrders(this.orderConditions)
+      }
+      if (this.cacheCondition && this.cacheCondition.length > 0) {
+        param['applyTime'] = this.cacheCondition[0].value
       }
       if (this.nickName) {
-        param.keyWord = this.nickName
+        param.keyword = this.nickName
       }
       if (this.appTemplateId) {
         param.conditions.push({