|
@@ -874,7 +874,7 @@ func (this *SandboxController) SandboxClassifyItems() {
|
|
|
for _, v := range sandboxAll {
|
|
|
if _, ok := sandListMap[v.SandboxClassifyId]; !ok {
|
|
|
list := make([]*sandbox.SandboxClassifyItems, 0)
|
|
|
- list = append(list, v)
|
|
|
+ list = append(list, v)
|
|
|
sandListMap[v.SandboxClassifyId] = list
|
|
|
} else {
|
|
|
sandListMap[v.SandboxClassifyId] = append(sandListMap[v.SandboxClassifyId], v)
|
|
@@ -1459,16 +1459,38 @@ func (this *SandboxController) SaveV2() {
|
|
|
|
|
|
var sandboxResp *sandbox.SandboxSaveResp
|
|
|
|
|
|
-
|
|
|
var errMsg string
|
|
|
- sandboxResp, err = sandboxService.AddSandboxV2(req, sysUser.AdminId, sysUser.RealName)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "保存失败!"
|
|
|
- if errMsg != `` {
|
|
|
- br.Msg = errMsg
|
|
|
+
|
|
|
+ if req.SandboxId == 0 {
|
|
|
+ //新增沙盘
|
|
|
+ sandboxResp, err = sandboxService.AddSandboxV2(req, sysUser.AdminId, sysUser.RealName)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "保存失败!"
|
|
|
+ if errMsg != `` {
|
|
|
+ br.Msg = errMsg
|
|
|
+ }
|
|
|
+ br.ErrMsg = "保存失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ //编辑沙盘
|
|
|
+ sandboxInfo := &sandbox.Sandbox{
|
|
|
+ Name: utils.TrimStr(req.Name),
|
|
|
+ Content: req.Content,
|
|
|
+ PicUrl: utils.TrimStr(req.PicUrl),
|
|
|
+ ModifyTime: time.Now(),
|
|
|
+ SandboxClassifyId: req.SandboxClassifyId,
|
|
|
+ }
|
|
|
+ var updateSandboxColumn = []string{"Content","PicUrl","ModifyTime","SandboxClassifyId"}
|
|
|
+ err = sandboxInfo.Update(updateSandboxColumn)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "保存失败!"
|
|
|
+ if errMsg != `` {
|
|
|
+ br.Msg = errMsg
|
|
|
+ }
|
|
|
+ br.ErrMsg = "保存失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
}
|
|
|
- br.ErrMsg = "保存失败,Err:" + err.Error()
|
|
|
- return
|
|
|
}
|
|
|
|
|
|
msg := "保存成功"
|
|
@@ -1510,7 +1532,6 @@ func (this *SandboxController) DeleteV2() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//删除沙盘
|
|
|
err = sandboxService.DeleteSandbox(req.SandboxId)
|
|
|
if err != nil {
|
|
@@ -1562,4 +1583,4 @@ func (this *SandboxController) GetSandboxDetail() {
|
|
|
br.Success = true
|
|
|
br.Msg = msg
|
|
|
br.Data = sandboxVersionInfo
|
|
|
-}
|
|
|
+}
|