1

6 months ago · 73ed2ad9fc
parent 8df9a16f13
commit 73ed2ad9fc
1 changed files with 5 additions and 2 deletions
--- a/app/store/model/PaymentTemplate.php
+++ b/app/store/model/PaymentTemplate.php
@ -34,10 +34,13 @@ class PaymentTemplate extends PaymentTemplateModel
     */
    public function getList($merchantId = 0): \think\Paginator
    {
-        $where = [];
+        $where = [
+            ['is_delete', '=', 0],
+        ];
        if (isset($merchantId) && $merchantId) {
-            $where = ['merchant_id', '=', $merchantId];
+            $where[] = ['merchant_id', '=', $merchantId];
        }
+
        return $this->where($where)->where('is_delete', '=', 0)
            ->order(['sort' => 'asc', $this->getPk()])
            ->paginate(15);