|
@@ -152,9 +152,9 @@ func (m *UserDAO) GetUserMenu(userid string) ([]model.SysMenu, error) {
|
152
|
152
|
var userMenu []model.SysMenu
|
153
|
153
|
var err error
|
154
|
154
|
if menu.MenuIds != "" {
|
155
|
|
- sql = `select * from sys_menu where menu_id in ('` + strings.Replace(menu.MenuIds, ",", "','", -1) + `')
|
|
155
|
+ sql = `select * from (select * from sys_menu where menu_id in ('` + strings.Replace(menu.MenuIds, ",", "','", -1) + `')
|
156
|
156
|
UNION
|
157
|
|
- select * from sys_menu where menu_id in (select father_id from sys_menu where menu_id in ('` + strings.Replace(menu.MenuIds, ",", "','", -1) + `'))
|
|
157
|
+ select * from sys_menu where menu_id in (select father_id from sys_menu where menu_id in ('` + strings.Replace(menu.MenuIds, ",", "','", -1) + `'))) s order by order_no asc
|
158
|
158
|
`
|
159
|
159
|
err = m.db.Sql(sql).Find(&userMenu)
|
160
|
160
|
}
|