From e14d01c045097893122e433a0c59268645c38ecd Mon Sep 17 00:00:00 2001 From: Edward Date: Fri, 1 Mar 2019 14:49:33 +0800 Subject: [PATCH] sync --- DataObjects/Core_company.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php index cb0af575..aca5be84 100644 --- a/DataObjects/Core_company.php +++ b/DataObjects/Core_company.php @@ -255,6 +255,18 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject { // we still use comptype in some old systems... + if(!empty($q['comptype']) && empty($q['comptype_id'])) { + $en = DB_DataObject::Factory('core_enum'); + $en->setFrom(array( + 'etype' => 'COMPTYPE', + 'name' => $q['comptype'], + 'active' => 1 + )); + if($en->find(true)) { + $this->comptype_id = $en->id; + } + } + if (!empty($q['comptype_id'])) { $en = DB_DataObject::Factory('core_enum'); $en->get($q['comptype_id']); @@ -274,13 +286,24 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject { // we still use comptype in some old systems... + if(!empty($q['comptype']) && empty($q['comptype_id'])) { + $en = DB_DataObject::Factory('core_enum'); + $en->setFrom(array( + 'etype' => 'COMPTYPE', + 'name' => $q['comptype'], + 'active' => 1 + )); + if($en->find(true)) { + $this->comptype_id = $en->id; + } + } + if (!empty($q['comptype_id'])) { $en = DB_DataObject::Factory('core_enum'); $en->get($q['comptype_id']); $this->comptype = $en->name; } - if(!empty($q['_flag_delete'])){ $this->deleted_dt = $this->sqlValue("NOW()"); $this->deleted_by = $roo->getAuthUser()->id; -- 2.39.2