Merge remote-tracking branch 'origin/master'

controllers/sandbox/sandbox.go

@@ -325,11 +325,11 @@ func (this *SandboxController) Save() {
 		return
 	}
 
-	var sandboxInfo *sandbox.Sandbox
+	var sandboxResp *sandbox.SandboxSaveResp
 	var errMsg string
 	if req.SandboxVersionCode == `` {
 		//新增沙盘
-		sandboxInfo, err = sandboxService.AddSandbox(req, sysUser.AdminId, sysUser.RealName)
+		sandboxResp, err = sandboxService.AddSandbox(req, sysUser.AdminId, sysUser.RealName)
 	} else {
 		////更新当前编辑中的状态缓存
 		//err = sandboxService.UpdateSandboxEditMark(req.SandboxId, sysUser.AdminId, 1)
@@ -339,7 +339,7 @@ func (this *SandboxController) Save() {
 		//}
 
 		//编辑沙盘
-		sandboxInfo, err, errMsg = sandboxService.UpdateSandbox(req, sysUser.AdminId, sysUser.RealName)
+		sandboxResp, err, errMsg = sandboxService.UpdateSandbox(req, sysUser.AdminId, sysUser.RealName)
 	}
 	if err != nil {
 		br.Msg = "保存失败！"
@@ -349,11 +349,12 @@ func (this *SandboxController) Save() {
 		br.ErrMsg = "保存失败，Err:" + err.Error()
 		return
 	}
+
 	msg := "保存成功"
 	br.Ret = 200
 	br.Success = true
 	br.Msg = msg
-	br.Data = sandboxInfo
+	br.Data = sandboxResp
 }
 
 // AddSandboxDraft

models/sandbox/sandbox.go

@@ -187,3 +187,9 @@ func GetList(condition string, pars []interface{}, startSize, pageSize int) (tot
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
 	return
 }
+
+// SandboxSaveResp 保存沙盘响应体
+type SandboxSaveResp struct {
+	*Sandbox
+	VersionCode string `description:"版本号"`
+}

services/sandbox/sandbox.go

@@ -15,14 +15,15 @@ import (
 )
 
 // AddSandbox 新增沙盘
-func AddSandbox(req request.AddAndEditSandbox, opUserId int, opUserName string) (sandboxInfo *sandbox.Sandbox, err error) {
+func AddSandbox(req request.AddAndEditSandbox, opUserId int, opUserName string) (resp *sandbox.SandboxSaveResp, err error) {
+	resp = new(sandbox.SandboxSaveResp)
 	// 获取产品权限详情
 	chartPermissionInfo, err := company.GetChartPermissionListById(req.ChartPermissionId)
 	if err != nil {
 		return
 	}
 	//沙盘主表信息
-	sandboxInfo = &sandbox.Sandbox{
+	sandboxInfo := &sandbox.Sandbox{
 		Name:                utils.TrimStr(req.Name),
 		ChartPermissionId:   req.ChartPermissionId,
 		ChartPermissionName: chartPermissionInfo.PermissionName,
@@ -64,11 +65,17 @@ func AddSandbox(req request.AddAndEditSandbox, opUserId int, opUserName string)
 
 	//新增沙盘
 	err = sandbox.AddNewSandbox(sandboxInfo, sandboxVersionInfo, sandboxDraftInfo)
+	if err != nil {
+		return
+	}
+	resp.Sandbox = sandboxInfo
+	resp.VersionCode = sandboxVersionInfo.VersionCode
 	return
 }
 
 // UpdateSandbox 更新沙盘
-func UpdateSandbox(req request.AddAndEditSandbox, opUserId int, opUserName string) (sandboxInfo *sandbox.Sandbox, err error, errMsg string) {
+func UpdateSandbox(req request.AddAndEditSandbox, opUserId int, opUserName string) (resp *sandbox.SandboxSaveResp, err error, errMsg string) {
+	resp = new(sandbox.SandboxSaveResp)
 	// 获取沙盘版本信息
 	sandboxVersion, err := sandbox.GetSandboxVersionBySandboxVersionCode(req.SandboxVersionCode)
 	if err != nil {
@@ -79,7 +86,7 @@ func UpdateSandbox(req request.AddAndEditSandbox, opUserId int, opUserName strin
 		return
 	}
 	// 获取沙盘主表信息
-	sandboxInfo, err = sandbox.GetSandboxById(sandboxVersion.SandboxId)
+	sandboxInfo, err := sandbox.GetSandboxById(sandboxVersion.SandboxId)
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
 			errMsg = "找不到该沙盘"
@@ -152,6 +159,11 @@ func UpdateSandbox(req request.AddAndEditSandbox, opUserId int, opUserName strin
 
 		//修改沙盘
 		err = sandbox.UpdateSandboxName(sandboxInfo, sandboxVersionInfo, sandboxDraftInfo, updateSandboxColumn, updateSandboxVersionColumn)
+		if err != nil {
+			return
+		}
+		resp.Sandbox = sandboxInfo
+		resp.VersionCode = sandboxVersionInfo.VersionCode
 	} else {
 		sandboxInfo.Name = utils.TrimStr(req.Name)
 		sandboxInfo.ChartPermissionId = req.ChartPermissionId
@@ -194,6 +206,11 @@ func UpdateSandbox(req request.AddAndEditSandbox, opUserId int, opUserName strin
 
 		//修改沙盘
 		err = sandbox.UpdateSandbox(sandboxInfo, updateSandbox, sandboxVersionInfo, sandboxDraftInfo)
+		if err != nil {
+			return
+		}
+		resp.Sandbox = sandboxInfo
+		resp.VersionCode = sandboxVersionInfo.VersionCode
 	}
 	return
 }