caipin 4 years atrás
parent
commit
dc85383870
2 changed files with 20 additions and 2 deletions
  1. 18 0
      services/bid_account_service.go
  2. 2 2
      web/api/project_setting_auth_api.go

+ 18 - 0
services/bid_account_service.go

@@ -20,6 +20,7 @@ import (
 //定义项目用户Service接口
 type BidAccountService interface {
 	ValidRule(ctx iris.Context) (viewmodels.BidAccount, error)
+	ValidRuleDelete(ctx iris.Context) (viewmodels.BidAccount, error)
 	Create(viewBidAccount viewmodels.BidAccount, projectId int, accountId int) error
 	Delete(viewBidAccount viewmodels.BidAccount, projectId int) error
 }
@@ -61,6 +62,23 @@ func (s *bidAccountService) ValidRule(ctx iris.Context) (viewmodels.BidAccount,
 	return bidAccountVaild, nil
 }
 
+// 删除标段关系用户验证
+func (s *bidAccountService) ValidRuleDelete(ctx iris.Context) (viewmodels.BidAccount, error) {
+	bidAccountVaild := viewmodels.BidAccount{}
+	err := ctx.ReadForm(&bidAccountVaild)
+	if err != nil {
+		log.Println("ReadForm转换异常, error=", err)
+		return bidAccountVaild, err
+	}
+
+	err = bidAccountVaild.Validate()
+	if err != nil {
+		log.Println("登录验证, error=", err)
+		return bidAccountVaild, err
+	}
+	return bidAccountVaild, nil
+}
+
 // 新增标段于账号的关系
 func (s *bidAccountService) Create(viewBidAccount viewmodels.BidAccount, projectId int, loginAccountId int) error {
 	// 写入关系表-标段的成员数量-账号表中标段ID

+ 2 - 2
web/api/project_setting_auth_api.go

@@ -172,7 +172,7 @@ func (c *ProjectSettingApi) PostBidAccountAuth() {
 // @Router /api/projectSetting/bid/account [delete]
 func (c *ProjectSettingApi) DeleteBidAccount() {
 	// 账号ID,标段ID
-	BidAccountData, err := c.ServiceBidAccount.ValidRule(c.Ctx)
+	BidAccountData, err := c.ServiceBidAccount.ValidRuleDelete(c.Ctx)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": utils.FormValidError(err)})
 		return
@@ -187,7 +187,7 @@ func (c *ProjectSettingApi) DeleteBidAccount() {
 	// 创建标段和账号的关系
 	err = c.ServiceBidAccount.Delete(BidAccountData, projectIdInt)
 	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": ""})
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
 	}
 	c.Ctx.JSON(iris.Map{