"src/page/main/system-admin/log/system-log/index.vue" did not exist on "f4a77a562a5a2dee17a7f1a7f3eada430aeec2c6"
Commit 6b8a9a7f authored by 黄智's avatar 黄智

菜单调整

parent e0b5a313
......@@ -22,4 +22,5 @@ type SystemMenu struct {
Source string `json:"source"`
NewWindow int `json:"new_window"`
Remark string `json:"remark"`
SystemType string `json:"system_type"` //系统类型
}
......@@ -13,6 +13,7 @@ type SystemMenuReq struct {
Source string `json:"source"`
NewWindow int `json:"new_window"`
Remark string `json:"remark"`
SystemType string `json:"system_type"` //系统类型
}
// 组织排序参数
......
......@@ -22,6 +22,7 @@ type SystemMenuTree struct {
MenuId string `json:"menu_id" xorm:"menu_id"` //菜单id
PMenuId string `json:"p_menu_id" xorm:"p_menu_id"` //上级菜单id
Source string `json:"source" xorm:"source"` //源
SystemType string `json:"system_type"` //系统类型
Child []SystemMenuTree `xorm:"-"`
}
......@@ -38,5 +39,6 @@ type SystemMenuTreePer struct {
Icon string `json:"icon" xorm:"menu_logo"` //菜单图标
MenuId string `json:"menu_id" xorm:"menu_id"` //菜单id
PMenuId string `json:"p_menu_id" xorm:"p_menu_id"` //上级菜单id
SystemType string `json:"system_type"` //系统类型
Children []SystemMenuTreePer `json:"children" xorm:"-"`
}
......@@ -235,7 +235,7 @@ func (s *SystemMenu) UpdateMenu(id int64, input request.SystemMenuReq) error {
if !has {
return resp.DbSelectError.ErrorDetail(errors.New("该菜单不存在"))
}
if _, err := db.Table("system_menu").Cols("menu_name, dict_group_id, state, menu_url, menu_logo, updated_by, updated_time", "source", "new_window", "remark").
if _, err := db.Table("system_menu").Cols("menu_name, dict_group_id, state, menu_url, menu_logo, updated_by, updated_time", "source", "new_window", "remark", "system_type").
Where("id = ?", id).Update(&entity.SystemMenu{
MenuName: input.MenuName,
DictGroupId: input.DictGroupId,
......@@ -247,6 +247,7 @@ func (s *SystemMenu) UpdateMenu(id int64, input request.SystemMenuReq) error {
Source: input.Source,
NewWindow: input.NewWindow,
Remark: input.Remark,
SystemType: input.SystemType,
}); err != nil {
conf.Logger.Error("更新菜单失败", zap.Error(err))
return resp.DbUpdateError.ErrorDetail(err)
......@@ -348,6 +349,7 @@ func (s *SystemMenu) GetInputToEntityMenu(input request.SystemMenuReq) (res enti
Source: input.Source,
NewWindow: input.NewWindow,
Remark: input.Remark,
SystemType: input.SystemType,
}
return res
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment