From 0dee6ce794e64226bdd6db56d83e4f45b7f592d1 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 2 Jul 2024 11:49:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AEdata:[]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/practical_training/model/pt_ne_config_data.go | 2 +- .../practical_training/service/pt_ne_config_data.impl.go | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/modules/practical_training/model/pt_ne_config_data.go b/src/modules/practical_training/model/pt_ne_config_data.go index ce2d4c09..15863396 100644 --- a/src/modules/practical_training/model/pt_ne_config_data.go +++ b/src/modules/practical_training/model/pt_ne_config_data.go @@ -17,7 +17,7 @@ type PtNeConfigData struct { // ====== 非数据库字段属性 ====== - ParamData []map[string]any `json:"paramData,omitempty" binding:"required" gorm:"-"` // 与ParamJson配合转换 + ParamData map[string]any `json:"paramData,omitempty" binding:"required" gorm:"-"` // 与ParamJson配合转换 } // TableName 表名称 diff --git a/src/modules/practical_training/service/pt_ne_config_data.impl.go b/src/modules/practical_training/service/pt_ne_config_data.impl.go index 3c5aaa4a..19f45653 100644 --- a/src/modules/practical_training/service/pt_ne_config_data.impl.go +++ b/src/modules/practical_training/service/pt_ne_config_data.impl.go @@ -79,7 +79,6 @@ func (r *PtNeConfigDataService) DeleteByIds(paramIds []string) (int64, error) { // SaveAsDefaultByType 保存为默认示例 func (r *PtNeConfigDataService) SaveAsDefaultByType(neInfo neModel.NeInfo, stubType, operUserName string) { confs := r.neConfigService.SelectList(neModel.NeConfig{NeType: neInfo.NeType}) - for _, v := range confs { // 查询是否存在记录 hasItems := r.SelectList(model.PtNeConfigData{ @@ -94,11 +93,10 @@ func (r *PtNeConfigDataService) SaveAsDefaultByType(neInfo neModel.NeInfo, stubT continue } // 将json数据转字符串存储 data:[{},{}] - dataArr, ok := resData["data"] - if !ok { + if _, ok := resData["data"]; !ok { continue } - paramDataByte, err := json.Marshal(dataArr) + paramDataByte, err := json.Marshal(resData) if err != nil { continue } @@ -142,7 +140,7 @@ func (r *PtNeConfigDataService) SelectByStubType(param model.PtNeConfigData) mod if len(list) > 0 { paraData = list[0] if err := json.Unmarshal([]byte(paraData.ParamJson), ¶Data.ParamData); err != nil { - paraData.ParamData = []map[string]any{} + paraData.ParamData = map[string]any{} } } return paraData