diff --git a/app/Entities/Customer/ClientEntity.php b/app/Entities/Customer/ClientEntity.php index 0e2d53e..16f2162 100644 --- a/app/Entities/Customer/ClientEntity.php +++ b/app/Entities/Customer/ClientEntity.php @@ -32,7 +32,7 @@ class ClientEntity extends CustomerEntity //기본기능 public function getCustomTitle(mixed $title = null): string { - return sprintf("[%s]%s", $this->getSite(), $title ? $title : $this->getTitle()); + return sprintf("%s/%s", $this->getSite(), $title ? $title : $this->getTitle()); } public function getName(): string { diff --git a/app/Forms/CommonForm.php b/app/Forms/CommonForm.php index e5e36d1..2ed4849 100644 --- a/app/Forms/CommonForm.php +++ b/app/Forms/CommonForm.php @@ -282,7 +282,7 @@ abstract class CommonForm break; case 'clientinfo_uid': foreach ($this->getFormOption_process(service('customer_clientservice'), $action, $field, $formDatas) as $entity) { - $tempOptions[$entity->getPK()] = $entity->getTitle(); + $tempOptions[$entity->getPK()] = $entity->getCustomTitle(); } $options['options'] = $tempOptions; break; diff --git a/app/Services/CommonService.php b/app/Services/CommonService.php index 0c47dc6..2fd977f 100644 --- a/app/Services/CommonService.php +++ b/app/Services/CommonService.php @@ -98,6 +98,8 @@ abstract class CommonService if ($where) { $this->model->where($where); } + //기본 Order By 이용하기위해 + $this->setOrderBy(); /** @var array<\App\Entities\CommonEntity> $results */ $results = $this->model->select(implode(',', $columns))->findAll(); log_message('debug', $this->model->getLastQuery()); diff --git a/app/Services/Customer/ClientService.php b/app/Services/Customer/ClientService.php index c6f9d0c..1b4c38e 100644 --- a/app/Services/Customer/ClientService.php +++ b/app/Services/Customer/ClientService.php @@ -67,11 +67,6 @@ class ClientService extends CustomerService //List 검색용 //FormFilter 조건절 처리 //검색어조건절처리 - public function setSearchWord(string $word): void - { - $this->model->orLike($this->model->getTable() . '.alias', $word, 'both'); - parent::setSearchWord($word); - } //OrderBy 처리 public function setOrderBy(mixed $field = null, mixed $value = null): void {