Merge pull request #7464 from dataease/pr@dev@fix_app-filter

fix: 修复应用记录中无法筛选的问题

core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml

@@ -66,9 +66,11 @@
             )
         </if>
         ) logInfo
+        <where>
             <if test="applyTime != null and applyTime.length > 1">
-            and (apply_time between #{applyTime.[0]} and #{applyTime.[1]}
+                and (logInfo.apply_time between #{applyTime.[0]} and #{applyTime.[1]})
             </if>
+        </where>
 
         <choose>
             <when test="orders!=null and orders.size > 0">

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]
         })

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({