XinanXf/ferry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug.

Browse Source
This commit is contained in:
Mr. Lan 2020-08-31 23:43:23 +08:00
parent 995d475c93
commit 1b617a038a
8 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apis/system/dept.go
View File

@ -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, "")
}

13
apis/system/menu.go
View File

@ -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

2
models/system/dept.go
View File

@ -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)

4
models/system/loginlog.go
View File

@ -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

10
models/system/menu.go
View File

@ -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)

4
models/system/post.go
View File

@ -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)

4
models/system/role.go
View File

@ -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 {

4
models/system/sysuser.go
View File

@ -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 {