From 965bb899ac46aadc019b0a469eefceaebfcede14 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 25 Apr 2024 14:24:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E5=8C=85=E6=96=B0=E5=A2=9E=E6=89=BE=E5=88=B0=E5=B7=B2=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E5=88=A0=E9=99=A4=E5=90=8E=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../network_element/controller/ne_software.go | 25 +++++++++++++------
 .../service/ne_software.impl.go               |  6 ++---
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/modules/network_element/controller/ne_software.go b/src/modules/network_element/controller/ne_software.go
index 94ecc1fc..5a60173f 100644
--- a/src/modules/network_element/controller/ne_software.go
+++ b/src/modules/network_element/controller/ne_software.go
@@ -69,15 +69,26 @@ func (s *NeSoftwareController) Add(c *gin.Context) {
 		return
 	}
 
-	// 检查属性值唯一
-	uniqueSoftware := s.neSoftwareService.CheckUniqueTypeAndNameAndVersion(body.NeType, body.Name, body.Version, "")
-	if !uniqueSoftware {
-		// 网元软件包操作【%s】失败，网元类型与文件名版本已存在
-		msg := i18n.TTemplate(language, "neSoftware.errKeyExists", map[string]any{"name": body.Name})
-		c.JSON(200, result.ErrMsg(msg))
-		return
+	// 找到已存在的删除后重新添加
+	neSoftwares := s.neSoftwareService.SelectList(model.NeSoftware{
+		NeType:  body.NeType,
+		Name:    body.Name,
+		Version: body.Version,
+	})
+	if len(neSoftwares) > 0 {
+		neSoftware := neSoftwares[0]
+		s.neSoftwareService.DeleteByIds([]string{neSoftware.ID})
 	}
 
+	// 检查属性值唯一
+	// uniqueSoftware := s.neSoftwareService.CheckUniqueTypeAndNameAndVersion(body.NeType, body.Name, body.Version, "")
+	// if !uniqueSoftware {
+	// 	// 网元软件包操作【%s】失败，网元类型与文件名版本已存在
+	// 	msg := i18n.TTemplate(language, "neSoftware.errKeyExists", map[string]any{"name": body.Name})
+	// 	c.JSON(200, result.ErrMsg(msg))
+	// 	return
+	// }
+
 	body.CreateBy = ctx.LoginUserToUserName(c)
 	insertId := s.neSoftwareService.Insert(body)
 	if insertId != "" {
diff --git a/src/modules/network_element/service/ne_software.impl.go b/src/modules/network_element/service/ne_software.impl.go
index 0f0ede9f..0fea558e 100644
--- a/src/modules/network_element/service/ne_software.impl.go
+++ b/src/modules/network_element/service/ne_software.impl.go
@@ -71,14 +71,14 @@ func (r *NeSoftwareImpl) Update(neSoftware model.NeSoftware) int64 {
 	if rows > 0 {
 		// 更新同类型的新包版本
 		neVersions := NewNeVersionImpl.SelectList(model.NeVersion{
-			NeType:  neSoftware.NeType,
-			NewPath: neSoftware.Path,
-			Status:  "3",
+			NeType: neSoftware.NeType,
+			Status: "3",
 		})
 		if len(neVersions) > 0 {
 			for _, neVersion := range neVersions {
 				neVersion.NewName = neSoftware.Name
 				neVersion.NewVersion = neSoftware.Version
+				neVersion.NewPath = neSoftware.Path
 				neVersion.Status = "3"
 				neVersion.UpdateBy = neSoftware.UpdateBy
 				NewNeVersionImpl.Update(neVersion)