From 61e3bdd5bdc1ce77c751602d4952554c192bf3e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=A4=80=ED=9D=A0?= <choi.jh@prime-idc.jp>
Date: Wed, 16 Oct 2024 14:24:50 +0900
Subject: [PATCH] cfmgrv4 init...3

---
 app/Models/Cloudflare/ZoneModel.php | 7 ++++---
 app/Models/CommonModel.php          | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Models/Cloudflare/ZoneModel.php b/app/Models/Cloudflare/ZoneModel.php
index 153cf26..adcebbd 100644
--- a/app/Models/Cloudflare/ZoneModel.php
+++ b/app/Models/Cloudflare/ZoneModel.php
@@ -63,7 +63,7 @@ class ZoneModel extends CommonModel
             case "content": //create form에서 사용
                 $rule = "required|trim|string";
                 break;
-            case "proxied": //create form에서 사용
+            case "proxied": //create form에서 사
                 $rule = "required|in_list[on,off]";
                 break;
             default:
@@ -132,8 +132,9 @@ class ZoneModel extends CommonModel
         //Subquery 방식사용
         $recordModel = new RecordModel();
         $recordModel->like(RecordModel::TABLE . '.content', $word, 'both');
-        $zone_uids = $recordModel->select(RecordModel::PARENT)->findAll();
-        $zone_uids = array_column($zone_uids, RecordModel::PARENT);
+        $recordModel->orlike(RecordModel::TABLE . '.' . RecordModel::TITLE, $word, 'both');
+        $recorde_entitys = $recordModel->select(RecordModel::PARENT)->findAll();
+        $zone_uids = array_column($recorde_entitys, RecordModel::PARENT);
         parent::setList_WordFilter($word, $field);
         $this->orWhereIn(self::TABLE . '.' . self::PK, array_values($zone_uids));
     }
diff --git a/app/Models/CommonModel.php b/app/Models/CommonModel.php
index 6b36379..2a9719c 100644
--- a/app/Models/CommonModel.php
+++ b/app/Models/CommonModel.php
@@ -211,7 +211,7 @@ abstract class CommonModel extends Model
     //List용
     final public function setList_FieldFilter(string $field, int|string $value): void
     {
-        $this->where($field, $value);
+        $this->where($this->getTable() . '.' . $field, $value);
     }
     public function setList_WordFilter(string $word, string $field = null): void
     {