1

app/mobile/apis/org_player_user.go

@@ -46,7 +46,7 @@ func (e OrgPlayerUser) GetMsg(c *gin.Context) {
 		return
 	}
 	if userId == 0 {
-		e.Error(500, err, "账号未找到")
+		e.Error(101, err, "账号未找到")
 		return
 	}
 
@@ -110,7 +110,7 @@ func (e OrgPlayerUser) Login(c *gin.Context) {
 
 	err = s.Login(&req, p, data)
 	if err != nil {
-		e.Error(500, err, fmt.Sprintf("获取球员账户信息 失败，\r\n失败信息 %s", err.Error()))
+		e.Error(101, err, "账号未找到")
 		return
 	}
 
@@ -130,7 +130,7 @@ func (e OrgPlayerUser) Login(c *gin.Context) {
 	err = sMsg.Get(&reqMsg)
 	if err != nil {
 		e.Logger.Error(err)
-		e.Error(500, err, "验证码不正确")
+		e.Error(102, err, "验证码不正确")
 		return
 	}
 

app/operate/apis/org_match_evaluate.go

@@ -227,15 +227,17 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) {
 		e.Error(500, err, err.Error())
 		return
 	}
+	delIds := make([]int, 0)
 	for _, v := range req.MatchImg {
-
 		if v.Id != "" {
-			reqWonderfulUpdate.Id, _ = strconv.Atoi(v.Id)
+			upId, _ := strconv.Atoi(v.Id)
+			reqWonderfulUpdate.Id = upId
 			reqWonderfulUpdate.WonderfulUrl = v.WonderfulUrl
 			reqWonderfulUpdate.WonderfulTitle = v.WonderfulTitle
 
 			reqWonderfulUpdate.SetUpdateBy(user.GetUserId(c))
 			sWonderful.Update(&reqWonderfulUpdate)
+			delIds = append(delIds, upId)
 		} else {
 			reqWonderfulInsert.Type = "1"
 			reqWonderfulInsert.MatchEvaluateId = strconv.Itoa(eId)
@@ -244,25 +246,33 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) {
 
 			reqWonderfulInsert.SetCreateBy(user.GetUserId(c))
 			sWonderful.Insert(&reqWonderfulInsert)
+			delIds = append(delIds, reqWonderfulInsert.Id)
 		}
 	}
 	for _, vMv := range req.MatchMv {
 		if vMv.Id != "" {
-			reqWonderfulUpdate.Id, _ = strconv.Atoi(vMv.Id)
+			upId, _ := strconv.Atoi(vMv.Id)
+			reqWonderfulUpdate.Id = upId
 			reqWonderfulUpdate.WonderfulUrl = vMv.WonderfulUrl
 			reqWonderfulUpdate.WonderfulTitle = vMv.WonderfulTitle
 
 			reqWonderfulUpdate.SetUpdateBy(user.GetUserId(c))
 			sWonderful.Update(&reqWonderfulUpdate)
+
+			delIds = append(delIds, upId)
 		} else {
-			reqWonderfulInsert.Type = "1"
+			reqWonderfulInsert.Type = "2"
 			reqWonderfulInsert.MatchEvaluateId = strconv.Itoa(eId)
 			reqWonderfulInsert.WonderfulUrl = vMv.WonderfulUrl
 			reqWonderfulInsert.WonderfulTitle = vMv.WonderfulTitle
 
 			reqWonderfulInsert.SetCreateBy(user.GetUserId(c))
 			sWonderful.Insert(&reqWonderfulInsert)
+			delIds = append(delIds, reqWonderfulInsert.Id)
 		}
 	}
+	reqWonderfulDelete := dto.OrgMatchEvaluateWonderfulDeleteReq{}
+	reqWonderfulDelete.Ids = delIds
+	sWonderful.Remove(&reqWonderfulDelete)
 	e.OK(req.GetId(), "修改成功")
 }

app/operate/service/org_match_evaluate_wonderful.go

@@ -67,6 +67,7 @@ func (e *OrgMatchEvaluateWonderful) Insert(c *dto.OrgMatchEvaluateWonderfulInser
 		e.Log.Errorf("OrgMatchEvaluateWonderfulService Insert error:%s \r\n", err)
 		return err
 	}
+	c.Id = data.Id
 	return nil
 }
 
@@ -89,13 +90,12 @@ func (e *OrgMatchEvaluateWonderful) Update(c *dto.OrgMatchEvaluateWonderfulUpdat
 }
 
 // Remove 删除OrgMatchEvaluateWonderful
-func (e *OrgMatchEvaluateWonderful) Remove(d *dto.OrgMatchEvaluateWonderfulDeleteReq, p *actions.DataPermission) error {
+func (e *OrgMatchEvaluateWonderful) Remove(d *dto.OrgMatchEvaluateWonderfulDeleteReq) error {
 	var data models.OrgMatchEvaluateWonderful
 
 	db := e.Orm.Model(&data).
-		Scopes(
-			actions.Permission(data.TableName(), p),
-		).Delete(&data, d.GetId())
+		Where("id not in (?)", d.GetId()).
+		Delete(&data)
 	if err := db.Error; err != nil {
 		e.Log.Errorf("Service RemoveOrgMatchEvaluateWonderful error:%s \r\n", err)
 		return err