From c291ad0b198500d7d07918f0fd67b5d5914eae25 Mon Sep 17 00:00:00 2001
From: xu <perelmen>
Date: Mon, 4 Nov 2019 15:16:14 +0800
Subject: [PATCH] 1. F 同的应用的版本号相同是允许的，按包名区分应用， 版本名称不可以重复得排除那些删除了的

---
 domain/upgrade/Upgrade.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/domain/upgrade/Upgrade.php b/domain/upgrade/Upgrade.php
index 49a2fbf..c5ad6ab 100644
--- a/domain/upgrade/Upgrade.php
+++ b/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;
             }
         }
--
libgit2 0.21.0