refactor🎨 移除设置log函数

This commit is contained in:
wenjianzhang
2021-05-16 21:47:49 +08:00
parent 33275573f9
commit b2345039e4
4 changed files with 16 additions and 20 deletions
+1 -3
View File
@@ -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,
}, "获取成功")
}
}
+4 -2
View File
@@ -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"`
}
}
+6 -4
View File
@@ -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
}
}