From 6f4701a5a426a4a79a75e3034803a5495e02836b Mon Sep 17 00:00:00 2001
From: "choi.jh" <choi.jh@prime-idc.jp>
Date: Wed, 9 Jul 2025 17:28:10 +0900
Subject: [PATCH] dbms_init...1

---
 app/Controllers/Admin/Customer/ServiceItemController.php | 5 +----
 app/Controllers/CommonController.php                     | 9 ++++++---
 app/Helpers/Customer/ServiceItemHelper.php               | 3 ++-
 app/Views/admin/service/view.php                         | 3 +--
 app/Views/templates/admin/index_content_top.php          | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Controllers/Admin/Customer/ServiceItemController.php b/app/Controllers/Admin/Customer/ServiceItemController.php
index acb9d69..c7028c7 100644
--- a/app/Controllers/Admin/Customer/ServiceItemController.php
+++ b/app/Controllers/Admin/Customer/ServiceItemController.php
@@ -2,9 +2,6 @@
 
 namespace App\Controllers\Admin\Customer;
 
-
-use App\Entities\Customer\ServiceEntity;
-use App\Entities\Customer\ServiceItemEntity;
 use App\Helpers\Customer\ServiceItemHelper;
 use App\Services\Customer\ServiceItemService;
 
@@ -77,7 +74,7 @@ class ServiceItemController extends CustomerController
                 if (!$item_type) {
                     throw new \Exception(__FUNCTION__ . "에서 item_type이 지정되지 않았습니다.");
                 }
-                $options = $this->getServiceService()->getFilterOptionsByItemType($item_type);
+                $options = $this->getFilterFieldOption($item_type);
                 break;
             default:
                 $options = parent::getFormFieldOption($field, $options);
diff --git a/app/Controllers/CommonController.php b/app/Controllers/CommonController.php
index 28bc89d..c34281b 100644
--- a/app/Controllers/CommonController.php
+++ b/app/Controllers/CommonController.php
@@ -564,10 +564,13 @@ abstract class CommonController extends BaseController
     //Filter 조건절 처리
     protected function setFilterConditionForList(): void
     {
+        if (!array_key_exists('filter_datas', $this->_control)) {
+            $this->_control['filter_values'] = [];
+        }
         foreach ($this->getFilterFields() as $field) {
-            $this->$field = $this->request->getVar($field);
-            if ($this->$field !== null && $this->$field !== '') {
-                $this->getService()->getModel()->where("{$this->getService()->getModel()->getTable()}.{$field}", $this->$field);
+            $this->_control['filter_values'][$field] = $this->request->getVar($field);
+            if ($this->_control['filter_values'][$field] !== null && $this->_control['filter_values'][$field] !== '') {
+                $this->getService()->getModel()->where("{$this->getService()->getModel()->getTable()}.{$field}", $this->_control['filter_values'][$field]);
             }
         }
     }
diff --git a/app/Helpers/Customer/ServiceItemHelper.php b/app/Helpers/Customer/ServiceItemHelper.php
index ddcdee2..eaa0d2d 100644
--- a/app/Helpers/Customer/ServiceItemHelper.php
+++ b/app/Helpers/Customer/ServiceItemHelper.php
@@ -18,7 +18,8 @@ class ServiceItemHelper extends CustomerHelper
     private function getFieldFormByItemType(string $field, mixed $value, array $viewDatas, array $extras = []): string
     {
         $form = "";
-        $item_type = $viewDatas['item_type'];
+        // dd($viewDatas);
+        $item_type = $viewDatas['control']['filter_values']['item_type'];
         //Field는 item_uid이지만 , item_tpe에 따라 filter_options가 달라진다.
         switch ($item_type) {
             case "IP":
diff --git a/app/Views/admin/service/view.php b/app/Views/admin/service/view.php
index 15e165d..0bf2052 100644
--- a/app/Views/admin/service/view.php
+++ b/app/Views/admin/service/view.php
@@ -2,8 +2,7 @@
 <?= $this->section('content') ?>
 <?php if ($error = session('error')): echo $viewDatas['helper']->alert($error) ?><?php endif ?>
 <div id="container" class="content action_form">
-  <link href=" /css/<?= $viewDatas['layout'] ?>/form.css" media="screen" rel="stylesheet" type="text/css" />
-  <div class=" row">
+  <div class="row">
     <div class="col-sm-4">
       <table class="table table-bordered">
         <?php foreach ($viewDatas['control']['view_fields'] as $field): ?>
diff --git a/app/Views/templates/admin/index_content_top.php b/app/Views/templates/admin/index_content_top.php
index 52ad84d..d428bdd 100644
--- a/app/Views/templates/admin/index_content_top.php
+++ b/app/Views/templates/admin/index_content_top.php
@@ -4,7 +4,7 @@
       <nav class="condition nav">
         조건:
         <?php foreach ($viewDatas['control']['filter_fields'] as $field): ?>
-          <?= $viewDatas['helper']->getFieldForm($field, $viewDatas[$field] ?? old($field), $viewDatas, ['id' => $field, 'index_content_top_filter' => 'true']) ?>&nbsp;
+          <?= $viewDatas['helper']->getFieldForm($field, $viewDatas['control']['filter_values'][$field] ?? old($field), $viewDatas, ['id' => $field, 'index_content_top_filter' => 'true']) ?>&nbsp;
         <?php endforeach ?>
       </nav>
       <nav class="search nav justify-content-center">