From ace1f656f252507c0d1833ecf2aa0907fb8b10c3 Mon Sep 17 00:00:00 2001
From: pengda <10266652509@qq.com>
Date: Wed, 18 Sep 2024 18:25:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8B=9F=E8=8D=AF=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model/mFormula.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/model/mFormula.php b/model/mFormula.php
index b936055..606f209 100644
--- a/model/mFormula.php
+++ b/model/mFormula.php
@@ -414,7 +414,8 @@ class mFormula extends mBase {
 
     public function getUserFormulaByUid($uid, $page_num, $page_size) {
         $offset = ($page_num - 1) * $page_size;
-        return $this->obj->selectAll($this->tbl, array('sql' => '`uid`=?', 'vals' => array($uid)), 'sort desc ', array($offset, $page_size));
+        $sql = "select s.id,s.uid,s.name,s.source,COALESCE(u.use_num, 0) AS use_num,s.sort,s.create_time from {$this->tbl} as s left join {$this->formula_use_log_tbl} as u on s.id=u.formula_id and u.uid={$uid} where s.uid={$uid} order by use_num desc,s.sort desc,s.id desc limit {$offset},{$page_size}";
+        return $this->obj->execute($sql, true, true);
     }
 
     public function getUserFormulaList($uid, $page_num, $page_size) {
@@ -427,6 +428,7 @@ class mFormula extends mBase {
         foreach ($data as &$da) {
             unset($da['original']);
 
+            $da['create_time'] = date('Y-m-d', strtotime($da['create_time']));
             $da['formula'] = $formula_arr[$da['id']];
         }