diff --git a/app/admin/apis/sys_menu.go b/app/admin/apis/sys_menu.go index 9f211b9..15ab0d1 100644 --- a/app/admin/apis/sys_menu.go +++ b/app/admin/apis/sys_menu.go @@ -114,7 +114,6 @@ func (e SysMenu) GetSysMenu(c *gin.Context) { func (e SysMenu) InsertSysMenu(c *gin.Context) { control := new(dto.SysMenuControl) err := e.MakeContext(c). - MakeLogger(). MakeOrm(). Errors if err != nil { @@ -158,7 +157,6 @@ func (e SysMenu) InsertSysMenu(c *gin.Context) { func (e SysMenu) UpdateSysMenu(c *gin.Context) { control := new(dto.SysMenuControl) err := e.MakeContext(c). - MakeLogger(). MakeOrm(). Errors if err != nil { @@ -335,4 +333,4 @@ func (e SysMenu) GetMenuTreeSelect(c *gin.Context) { "menus": result, "checkedKeys": menuIds, }, "获取成功") -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_menu.go b/app/admin/service/dto/sys_menu.go index 4a0a5fc..ae62d2c 100644 --- a/app/admin/service/dto/sys_menu.go +++ b/app/admin/service/dto/sys_menu.go @@ -92,7 +92,9 @@ func (s *SysMenuControl) Bind(ctx *gin.Context) error { // Generate 结构体数据转化 从 Control 至 model 对应的模型 func (s *SysMenuControl) Generate(model *models.SysMenu) { - model.MenuId = s.MenuId + if s.MenuId != 0 { + model.MenuId = s.MenuId + } model.MenuName = s.MenuName model.Title = s.Title model.Icon = s.Icon @@ -168,4 +170,4 @@ type MenuRole struct { type SelectRole struct { RoleId int `uri:"roleId"` -} +} \ No newline at end of file diff --git a/app/admin/service/sys_menu.go b/app/admin/service/sys_menu.go index 594d144..e300753 100644 --- a/app/admin/service/sys_menu.go +++ b/app/admin/service/sys_menu.go @@ -81,9 +81,11 @@ func (e *SysMenu) GetSysMenu(d *dto.SysMenuById, model *models.SysMenu) error { e.Log.Errorf("db error:%s", err) return err } + apis := make([]int, 0) for _, v := range model.SysApi { - model.Apis = append(model.Apis, v.Id) + apis = append(model.Apis, v.Id) } + model.Apis = apis return nil } @@ -121,7 +123,7 @@ func (e *SysMenu) initPaths(menu *models.SysMenu) error { // UpdateSysMenu 修改SysMenu对象 func (e *SysMenu) UpdateSysMenu(c *dto.SysMenuControl) *SysMenu { var err error - model := models.SysMenu{} + var model = models.SysMenu{} e.Orm.First(&model, c.GetId()) c.Generate(&model) db := e.Orm.Session(&gorm.Session{FullSaveAssociations: true}).Debug().Save(&model) @@ -131,7 +133,7 @@ func (e *SysMenu) UpdateSysMenu(c *dto.SysMenuControl) *SysMenu { return e } if db.RowsAffected == 0 { - e.AddError(errors.New("无权更新该数据")) + _ = e.AddError(errors.New("无权更新该数据")) return e } return e @@ -320,4 +322,4 @@ func (e *SysMenu) getByRoleName(roleName string) (Menus []models.SysMenu, err er return } return -} +} \ No newline at end of file diff --git a/common/apis/api.go b/common/apis/api.go index 6d6cf32..cf21cfd 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -21,20 +21,20 @@ type Api struct { Errors error } -func (e *Api) AddError(err error) error { +func (e *Api) AddError(err error) { if e.Errors == nil { e.Errors = err } else if err != nil { e.Logger.Error(err) e.Errors = fmt.Errorf("%v; %w", e.Error, err) } - return e.Errors } // MakeContext 设置http上下文 func (e *Api) MakeContext(c *gin.Context) *Api { fmt.Println(&c) e.Context = c + e.Logger = api.GetRequestLogger(c) fmt.Println(&e.Context) return e } @@ -91,25 +91,19 @@ func (e Api) GetOrm() (*gorm.DB, error) { return db, nil } -// MakeLogger 设置上下文提供的日志 -func (e *Api) MakeLogger() *Api { - e.Logger = api.GetRequestLogger(e.Context) - return e -} - // MakeOrm 设置Orm DB func (e *Api) MakeOrm() *Api { var err error if e.Logger == nil { err = errors.New("at MakeOrm logger is nil") //e.Logger.Error(http.StatusInternalServerError, err, "at MakeOrm logger is nil") - _ = e.AddError(err) + e.AddError(err) return e } db, err := pkg.GetOrm(e.Context) if err != nil { e.Logger.Error(http.StatusInternalServerError, err, "数据库连接获取失败") - _ = e.AddError(err) + e.AddError(err) } e.Orm = db return e @@ -133,4 +127,4 @@ func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int, // Custom 兼容函数 func (e Api) Custom(data gin.H) { response.Custum(e.Context, data) -} +} \ No newline at end of file