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 @@
)
) logInfo
-
- and (apply_time between #{applyTime.[0]} and #{applyTime.[1]}
-
+
+
+ and (logInfo.apply_time between #{applyTime.[0]} and #{applyTime.[1]})
+
+
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({