diff --git a/config/zentaopms.php b/config/zentaopms.php index 731f4db128..a903e649fc 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -372,8 +372,6 @@ define('TABLE_DIMENSION', '`' . $config->db->prefix . 'dimension`'); define('TABLE_SCENE', '`' . $config->db->prefix . 'scene`'); define('VIEW_SCENECASE', '`ztv_scenecase`'); -define('CHANGEVALUE', 100000000); - define('TABLE_PRIV', '`' . $config->db->prefix . 'priv`'); define('TABLE_PRIVLANG', '`' . $config->db->prefix . 'privlang`'); define('TABLE_PRIVMANAGER', '`' . $config->db->prefix . 'privmanager`'); diff --git a/module/testcase/model.php b/module/testcase/model.php index 1f02800835..ef1330625b 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -3536,7 +3536,7 @@ class testcaseModel extends model if(isset($sceneIds[$tmpPId])) { $pScene = $sceneIds[$tmpPId]; - $scene = $pScene["id"] + CHANGEVALUE; + $scene = $pScene["id"]; } $id = isset($testcaseData["id"]) ? $testcaseData["id"] : -1; @@ -3692,10 +3692,7 @@ class testcaseModel extends model $this->dao->insert(TABLE_SCENE)->data($scene)->autoCheck()->exec(); $sceneID = $this->dao->lastInsertID(); - $order = new stdclass(); - $order->sort = ($sceneID + CHANGEVALUE); - - $this->dao->update(TABLE_SCENE)->data($order)->where('id')->eq((int)$sceneID)->exec(); + $this->dao->update(TABLE_SCENE)->set('`order`')->eq($sceneID)->where('id')->eq((int)$sceneID)->exec(); } else { @@ -3718,18 +3715,16 @@ class testcaseModel extends model $pScene = isset($sceneIds[$tmpPId]) ? $sceneIds[$tmpPId] : array(); $parent = 0; $grade = 1; - $path = ",".($sceneID + CHANGEVALUE).","; + $path = ",{$sceneID},"; if(isset($sceneIds[$tmpPId])) { $parent = $pScene["id"]; $parentScene = $this->dao->findById((int)$parent)->from(TABLE_SCENE)->fetch(); - $path = $parentScene->path . ($sceneID + CHANGEVALUE).","; + $path = $parentScene->path . $sceneID . ','; $grade = $parentScene->grade + 1; } - if($parent != 0) $parent = $parent + CHANGEVALUE; - $this->dao->update(TABLE_SCENE) ->set('parent')->eq($parent) ->set('path')->eq($path) @@ -3823,7 +3818,7 @@ class testcaseModel extends model $caseList = $this->dao->select($fields)->from(TABLE_CASE)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') ->leftJoin(TABLE_MODULE)->alias('t3')->on('t1.module = t3.id') - ->leftJoin(TABLE_SCENE)->alias('t4')->on('t1.scene = t4.id+' . CHANGEVALUE) + ->leftJoin(TABLE_SCENE)->alias('t4')->on('t1.scene = t4.id') ->where('t1.deleted')->eq(0) ->andWhere('t1.product')->eq($productID) ->beginIF($moduleID > 0)->andWhere('t1.module')->eq($moduleID)->fi()