Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
so-operation-api
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
smart-operation
so-operation-api
Commits
6b8a9a7f
"src/page/main/system-admin/log/system-log/index.vue" did not exist on "f4a77a562a5a2dee17a7f1a7f3eada430aeec2c6"
Commit
6b8a9a7f
authored
Jul 07, 2023
by
黄智
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
菜单调整
parent
e0b5a313
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
1 deletion
+7
-1
src/bean/entity/system_menu.go
src/bean/entity/system_menu.go
+1
-0
src/bean/vo/request/system_menu.go
src/bean/vo/request/system_menu.go
+1
-0
src/bean/vo/response/system_menu.go
src/bean/vo/response/system_menu.go
+2
-0
src/service/system_menu.go
src/service/system_menu.go
+3
-1
No files found.
src/bean/entity/system_menu.go
View file @
6b8a9a7f
...
...
@@ -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"`
//系统类型
}
src/bean/vo/request/system_menu.go
View file @
6b8a9a7f
...
...
@@ -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"`
//系统类型
}
// 组织排序参数
...
...
src/bean/vo/response/system_menu.go
View file @
6b8a9a7f
...
...
@@ -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:"-"`
}
src/service/system_menu.go
View file @
6b8a9a7f
...
...
@@ -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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment