From c98ecec2c1a5bef7fc437e26e51e6f6fece615a6 Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Thu, 8 Nov 2018 12:00:21 +0800
Subject: [PATCH] DataObjects/Core_company.php

---
 DataObjects/Core_company.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index 7e056a12..3e7a3e5e 100644
--- a/DataObjects/Core_company.php
+++ b/DataObjects/Core_company.php
@@ -256,6 +256,10 @@ class Pman_Core_DataObjects_Core_Company extends DB_DataObject
     {
         // we still use comptype in some old systems...
         
+        if(!empty($q['_merge_id'])){
+            $this->merge($q['_merge_id'], $roo);
+        }
+        
         if (!empty($q['comptype_id'])) {
             $en = DB_DataObject::Factory('core_enum');
             $en->get($q['comptype_id']);
-- 
2.39.2