From 1b617a038ab5f7105fbe154c2e8ced007d743ba6 Mon Sep 17 00:00:00 2001 From: "Mr. Lan" Date: Mon, 31 Aug 2020 23:43:23 +0800 Subject: [PATCH] fix bug. --- apis/system/dept.go | 12 +++++++++--- apis/system/menu.go | 13 +++++++++++-- models/system/dept.go | 2 +- models/system/loginlog.go | 4 ++-- models/system/menu.go | 10 +++++----- models/system/post.go | 4 ++-- models/system/role.go | 4 ++-- models/system/sysuser.go | 4 ++-- 8 files changed, 34 insertions(+), 19 deletions(-) diff --git a/apis/system/dept.go b/apis/system/dept.go index caed03e..0c950f9 100644 --- a/apis/system/dept.go +++ b/apis/system/dept.go @@ -25,18 +25,24 @@ import ( // @Security func GetDeptList(c *gin.Context) { var ( - Dept system.Dept - err error + Dept system.Dept + err error + result []system.Dept ) Dept.DeptName = c.Request.FormValue("deptName") Dept.Status = c.Request.FormValue("status") Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId")) - result, err := Dept.SetDept(true) + if Dept.DeptName == "" { + result, err = Dept.SetDept(true) + } else { + result, err = Dept.GetPage(true) + } if err != nil { app.Error(c, -1, err, "") return } + app.OK(c, result, "") } diff --git a/apis/system/menu.go b/apis/system/menu.go index 16c485a..cf4dff7 100644 --- a/apis/system/menu.go +++ b/apis/system/menu.go @@ -22,11 +22,20 @@ import ( // @Router /api/v1/menulist [get] // @Security Bearer func GetMenuList(c *gin.Context) { - var Menu system.Menu + var ( + err error + Menu system.Menu + result []system.Menu + ) Menu.MenuName = c.Request.FormValue("menuName") Menu.Visible = c.Request.FormValue("visible") Menu.Title = c.Request.FormValue("title") - result, err := Menu.SetMenu() + + if Menu.Title == "" { + result, err = Menu.SetMenu() + } else { + result, err = Menu.GetPage() + } if err != nil { app.Error(c, -1, err, "") return diff --git a/models/system/dept.go b/models/system/dept.go index 3eec873..455f004 100644 --- a/models/system/dept.go +++ b/models/system/dept.go @@ -109,7 +109,7 @@ func (e *Dept) GetPage(bl bool) ([]Dept, error) { table = table.Where("dept_id = ?", e.DeptId) } if e.DeptName != "" { - table = table.Where("dept_name = ?", e.DeptName) + table = table.Where("dept_name like ?", "%"+e.DeptName+"%") } if e.Status != "" { table = table.Where("status = ?", e.Status) diff --git a/models/system/loginlog.go b/models/system/loginlog.go index b039ba1..ea9b25f 100644 --- a/models/system/loginlog.go +++ b/models/system/loginlog.go @@ -53,13 +53,13 @@ func (e *LoginLog) GetPage(pageSize int, pageIndex int) ([]LoginLog, int, error) table := orm.Eloquent.Select("*").Table(e.TableName()) if e.Ipaddr != "" { - table = table.Where("ipaddr = ?", e.Ipaddr) + table = table.Where("ipaddr like ?", "%"+e.Ipaddr+"%") } if e.Status != "" { table = table.Where("status = ?", e.Status) } if e.Username != "" { - table = table.Where("userName = ?", e.Username) + table = table.Where("username like ?", "%"+e.Username+"%") } var count int diff --git a/models/system/menu.go b/models/system/menu.go index 4d747b5..fbb3722 100644 --- a/models/system/menu.go +++ b/models/system/menu.go @@ -92,14 +92,14 @@ func (e *Menu) GetByMenuId() (Menu Menu, err error) { } func (e *Menu) SetMenu() (m []Menu, err error) { - menulist, err := e.GetPage() + menuList, err := e.GetPage() m = make([]Menu, 0) - for i := 0; i < len(menulist); i++ { - if menulist[i].ParentId != 0 { + for i := 0; i < len(menuList); i++ { + if menuList[i].ParentId != 0 { continue } - menusInfo := DiguiMenu(&menulist, menulist[i]) + menusInfo := DiguiMenu(&menuList, menuList[i]) m = append(m, menusInfo) } @@ -251,7 +251,7 @@ func (e *Menu) GetPage() (Menus []Menu, err error) { table = table.Where("menu_name = ?", e.MenuName) } if e.Title != "" { - table = table.Where("title = ?", e.Title) + table = table.Where("title like ?", "%"+e.Title+"%") } if e.Visible != "" { table = table.Where("visible = ?", e.Visible) diff --git a/models/system/post.go b/models/system/post.go index 17fdb59..24dd98a 100644 --- a/models/system/post.go +++ b/models/system/post.go @@ -93,10 +93,10 @@ func (e *Post) GetPage(pageSize int, pageIndex int) ([]Post, int, error) { table = table.Where("post_id = ?", e.PostId) } if e.PostName != "" { - table = table.Where("post_name = ?", e.PostName) + table = table.Where("post_name like ?", "%"+e.PostName+"%") } if e.PostCode != "" { - table = table.Where("post_code = ?", e.PostCode) + table = table.Where("post_code like ?", "%"+e.PostCode+"%") } if e.Status != "" { table = table.Where("status = ?", e.Status) diff --git a/models/system/role.go b/models/system/role.go index 7440547..83a69e8 100644 --- a/models/system/role.go +++ b/models/system/role.go @@ -46,13 +46,13 @@ func (e *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error) { table = table.Where("role_id = ?", e.RoleId) } if e.RoleName != "" { - table = table.Where("role_name = ?", e.RoleName) + table = table.Where("role_name like ?", "%"+e.RoleName+"%") } if e.Status != "" { table = table.Where("status = ?", e.Status) } if e.RoleKey != "" { - table = table.Where("role_key = ?", e.RoleKey) + table = table.Where("role_key like ?", "%"+e.RoleKey+"%") } if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { diff --git a/models/system/sysuser.go b/models/system/sysuser.go index 614054f..1ed6732 100644 --- a/models/system/sysuser.go +++ b/models/system/sysuser.go @@ -206,14 +206,14 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, erro table = table.Joins("left join sys_dept on sys_dept.dept_id = sys_user.dept_id") if e.Username != "" { - table = table.Where("username = ?", e.Username) + table = table.Where("sys_user.username like ?", "%"+e.Username+"%") } if e.Status != "" { table = table.Where("sys_user.status = ?", e.Status) } if e.Phone != "" { - table = table.Where("sys_user.phone = ?", e.Phone) + table = table.Where("sys_user.phone like ?", "%"+e.Phone+"%") } if e.DeptId != 0 {