From d984aeabb69e43e504729ec0807773c5da5d902b Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Mon, 29 Mar 2010 07:52:59 +0000 Subject: [PATCH] * fix the bug of convertModule. --- trunk/module/convert/converter/bugfree1.php | 6 ++++-- trunk/module/convert/converter/bugfree2.php | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/trunk/module/convert/converter/bugfree1.php b/trunk/module/convert/converter/bugfree1.php index b95fc744d8..bf992edb55 100644 --- a/trunk/module/convert/converter/bugfree1.php +++ b/trunk/module/convert/converter/bugfree1.php @@ -148,9 +148,11 @@ class bugfree1ConvertModel extends bugfreeConvertModel } /* 更新parent。*/ - foreach($this->map['module'] as $oldModuleID => $newModuleID) + foreach($modules as $oldModuleID => $module) { - $this->dao->dbh($this->dbh)->update(TABLE_MODULE)->set('parent')->eq($newModuleID)->where('parent')->eq($oldModuleID)->exec(); + $newModuleID = $this->map['module'][$oldModuleID]; + $newParentID = $this->map['module'][$module->parent]; + $this->dao->dbh($this->dbh)->update(TABLE_MODULE)->set('parent')->eq($newParentID)->where('id')->eq($newModuleID)->exec(); } return count($modules); } diff --git a/trunk/module/convert/converter/bugfree2.php b/trunk/module/convert/converter/bugfree2.php index 775da5d6d2..a771d876ea 100644 --- a/trunk/module/convert/converter/bugfree2.php +++ b/trunk/module/convert/converter/bugfree2.php @@ -26,7 +26,6 @@ class bugfree2ConvertModel extends bugfreeConvertModel /* 执行转换。*/ public function execute() { - $this->clear(); $this->setTable(); $this->convertGroup(); $result['users'] = $this->convertUser(); @@ -169,9 +168,11 @@ class bugfree2ConvertModel extends bugfreeConvertModel } /* 更新parent。*/ - foreach($this->map['module'] as $oldModuleID => $newModuleID) + foreach($modules as $oldModuleID => $module) { - $this->dao->dbh($this->dbh)->update(TABLE_MODULE)->set('parent')->eq($newModuleID)->where('parent')->eq($oldModuleID)->exec(); + $newModuleID = $this->map['module'][$oldModuleID]; + $newParentID = $this->map['module'][$module->parent]; + $this->dao->dbh($this->dbh)->update(TABLE_MODULE)->set('parent')->eq($newParentID)->where('id')->eq($newModuleID)->exec(); } return count($modules); }