Commitcf16a4e

committed

gf map nil 转换问题

1 parent33fdbd9 commitcf16a4eCopy full SHA for cf16a4e

File tree

+16

-11

lines changed

+16

-11

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func (a *ActionExecutor) Update(ctx context.Context, table string, data model.Ma`
`90`	`90`	`continue`
`91`	`91`	`}`
`92`	`92`	`ifk==consts.Raw {`
`93`		`-m=m.Where(v.(map[string]any))`
	`93`	`+m=m.Where(v.(map[string][]any))`
`94`	`94`	`delete(where,k)`
`95`	`95`	`continue`
`96`	`96`	`}`
`@@ -119,6 +119,12 @@ func (a *ActionExecutor) Update(ctx context.Context, table string, data model.Ma`
`119`	`119`	`delete(data,k)`
`120`	`120`	`continue`
`121`	`121`	`}`
	`122`	`+`
	`123`	`+ifdata[k]==nil {`
	`124`	`+// 此处目前不允许外部设置null`
	`125`	`+delete(data,k)`
	`126`	`+}`
	`127`	`+`
`122`	`128`	`}`
`123`	`129`
`124`	`130`	`_ret,err:=m.Where(where).Update(data)`

Lines changed: 9 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`	`"github.com/glennliao/apijson-go/consts"`
`13`	`13`	`"github.com/glennliao/apijson-go/model"`
`14`	`14`	`"github.com/gogf/gf/v2/container/gmap"`
	`15`	`+"github.com/gogf/gf/v2/errors/gcode"`
`15`	`16`	`"github.com/gogf/gf/v2/errors/gerror"`
`16`	`17`	`"github.com/gogf/gf/v2/frame/g"`
`17`	`18`	`"github.com/gogf/gf/v2/net/ghttp"`
`@@ -161,16 +162,14 @@ func CommonResponse(handler func(ctx context.Context, req model.Map) (res model.`
`161`	`162`	`}`
`162`	`163`	`}else {`
`163`	`164`
`164`		`-if_,ok:=err.(*gerror.Error);ok {`
`165`		`-// if e.Code() == gcode.CodeNil {`
`166`		`-// code = 400`
`167`		`-// msg = e.Error()`
`168`		`-// } else {`
`169`		`-// code = 500`
`170`		`-// msg = "系统异常"`
`171`		`-// }`
`172`		`-code=500`
`173`		`-msg="系统异常"`
	`165`	`+ife,ok:=err.(*gerror.Error);ok {`
	`166`	`+ife.Code()==gcode.CodeInvalidParameter {`
	`167`	`+code=400`
	`168`	`+msg=e.Error()`
	`169`	`+}else {`
	`170`	`+code=500`
	`171`	`+msg="系统异常"`
	`172`	`+}`
`174`	`173`	`}else {`
`175`	`174`	`code=500`
`176`	`175`	`msg="系统异常"`

Comments

(0)