diff --git a/controllers/BookController.go b/controllers/BookController.go index 80be3d24..db21ddf6 100644 --- a/controllers/BookController.go +++ b/controllers/BookController.go @@ -895,18 +895,22 @@ func (c *BookController) TeamDelete() { teamId, _ := c.GetInt("teamId") + if teamId <= 0 { + c.JsonResult(5001,"参数错误") + } book, err := c.IsPermission() if err != nil { - c.JsonResult(500, err.Error()) + c.JsonResult(5002, err.Error()) } + beego.Error(book) err = models.NewTeamRelationship().DeleteByBookId(book.BookId, teamId) if err != nil { if err == orm.ErrNoRows { - c.JsonResult(500, "团队未加入项目") + c.JsonResult(5003, "团队未加入项目") } - c.JsonResult(500, err.Error()) + c.JsonResult(5004, err.Error()) } c.JsonResult(0, "OK") } diff --git a/models/TeamRelationship.go b/models/TeamRelationship.go index ffba768e..5ff0cd4a 100644 --- a/models/TeamRelationship.go +++ b/models/TeamRelationship.go @@ -75,7 +75,8 @@ func (m *TeamRelationship) DeleteByBookId(bookId int, teamId int) error { beego.Error("查询项目团队失败 ->", err) return err } - return m.Delete(teamId) + m.Include() + return m.Delete(m.TeamRelationshipId) } //保存团队项目. diff --git a/views/book/dashboard.tpl b/views/book/dashboard.tpl index 4a09f6c7..f1933765 100644 --- a/views/book/dashboard.tpl +++ b/views/book/dashboard.tpl @@ -28,9 +28,9 @@
diff --git a/views/book/team.tpl b/views/book/team.tpl index b40dfa00..1ab5f594 100644 --- a/views/book/team.tpl +++ b/views/book/team.tpl @@ -29,8 +29,8 @@ diff --git a/views/book/users.tpl b/views/book/users.tpl index 371e34fe..5a74d891 100644 --- a/views/book/users.tpl +++ b/views/book/users.tpl @@ -23,10 +23,10 @@