1. F 同的应用的版本号相同是允许的，按包名区分应用，版本名称不可以重复得排除那些删除了的

xu
1 parent b9c38308
Showing 1 changed file with 13 additions and 2 deletions Show diff stats
domain/upgrade/Upgrade.php
@@ -25,6 +25,8 @@ class Upgrade
                 'manufacture_id'    => $item["manufacture_id"],
                 'project_id'        => $item["project_id"],
                 'model_id'          => $item["model_id"],
+                'package_name'      => $item["package_name"],
+                'is_delete'         => 0,
                 'type'              => $item["type"]
             ];
             $findUpgradeModel = UpgradeModel::findOne($where);
@@ -65,8 +67,17 @@ class Upgrade
             return false;
         }
         if (isset($item['version']) && $upgradeModel->version != $item['version']) {
-            $findUpgradeModel = UpgradeModel::findOne(['version' => $item["version"], 'tpye' => $item["type"]]);
-            if (!empty($findUpgradeModel)) {
+            $where = [
+                'version'           => $item["version"],
+                'manufacture_id'    => $item["manufacture_id"],
+                'project_id'        => $item["project_id"],
+                'model_id'          => $item["model_id"],
+                'package_name'      => $item["package_name"],
+                'is_delete'         => 0,
+                'type'              => $item["type"]
+            ];
+            $findUpgradeModel = UpgradeModel::findOne($where);
+            if (!empty($findUpgradeModel) && $findUpgradeModel->id != $id) {
                 return -1;
             }
         }
...	...	@@ -25,6 +25,8 @@ class Upgrade
25	25	'manufacture_id' => $item["manufacture_id"],
26	26	'project_id' => $item["project_id"],
27	27	'model_id' => $item["model_id"],
	28	+ 'package_name' => $item["package_name"],
	29	+ 'is_delete' => 0,
28	30	'type' => $item["type"]
29	31	];
30	32	$findUpgradeModel = UpgradeModel::findOne($where);
...	...	@@ -65,8 +67,17 @@ class Upgrade
65	67	return false;
66	68	}
67	69	if (isset($item['version']) && $upgradeModel->version != $item['version']) {
68		- $findUpgradeModel = UpgradeModel::findOne(['version' => $item["version"], 'tpye' => $item["type"]]);
69		- if (!empty($findUpgradeModel)) {
	70	+ $where = [
	71	+ 'version' => $item["version"],
	72	+ 'manufacture_id' => $item["manufacture_id"],
	73	+ 'project_id' => $item["project_id"],
	74	+ 'model_id' => $item["model_id"],
	75	+ 'package_name' => $item["package_name"],
	76	+ 'is_delete' => 0,
	77	+ 'type' => $item["type"]
	78	+ ];
	79	+ $findUpgradeModel = UpgradeModel::findOne($where);
	80	+ if (!empty($findUpgradeModel) && $findUpgradeModel->id != $id) {
70	81	return -1;
71	82	}
72	83	}
...	...