From b325b4d5ac92eb788f9052b91ae4b5000533236a Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 16 May 2025 17:43:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BB=E6=9C=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=E7=A6=81=E6=AD=A2=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=BD=91=E5=85=83=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/network_element/controller/ne_host.go | 2 +- src/modules/network_element/service/ne_host.go | 5 +++-- src/modules/network_element/service/ne_info.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/network_element/controller/ne_host.go b/src/modules/network_element/controller/ne_host.go index be385c53..db9b2c3d 100644 --- a/src/modules/network_element/controller/ne_host.go +++ b/src/modules/network_element/controller/ne_host.go @@ -169,7 +169,7 @@ func (s NeHostController) Remove(c *gin.Context) { ids = append(ids, parse.Number(v)) } - rows, err := s.neHostService.DeleteByIds(ids) + rows, err := s.neHostService.DeleteByIds(ids, true) if err != nil { c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error()))) return diff --git a/src/modules/network_element/service/ne_host.go b/src/modules/network_element/service/ne_host.go index ca18359b..197ef3f2 100644 --- a/src/modules/network_element/service/ne_host.go +++ b/src/modules/network_element/service/ne_host.go @@ -137,7 +137,8 @@ func (r NeHost) Update(neHost model.NeHost) int64 { } // DeleteByIds 批量删除网元主机连接信息 -func (r NeHost) DeleteByIds(hostIds []int64) (int64, error) { +// checkNeHost 是否检查网元主机 +func (r NeHost) DeleteByIds(hostIds []int64, checkNeHost bool) (int64, error) { // 检查是否存在 ids := r.neHostRepository.SelectByIds(hostIds) if len(ids) <= 0 { @@ -145,7 +146,7 @@ func (r NeHost) DeleteByIds(hostIds []int64) (int64, error) { } for _, v := range ids { - if v.GroupID == "1" { + if v.GroupID == "1" && checkNeHost { // 主机信息操作【%s】失败,禁止操作网元 return 0, fmt.Errorf("neHost.banNE") } diff --git a/src/modules/network_element/service/ne_info.go b/src/modules/network_element/service/ne_info.go index 5cfcaa9f..ff9eae08 100644 --- a/src/modules/network_element/service/ne_info.go +++ b/src/modules/network_element/service/ne_info.go @@ -316,7 +316,7 @@ func (r NeInfo) DeleteByIds(ids []int64) (int64, error) { for _, hostId := range arr { hostIds = append(hostIds, parse.Number(hostId)) } - r.neHostService.DeleteByIds(hostIds) + r.neHostService.DeleteByIds(hostIds, false) } // 删除License neLicense := NewNeLicense.FindByNeTypeAndNeID(v.NeType, v.NeId)