diff --git a/web/controllers/user_controller.go b/web/controllers/user_controller.go index 7f68116..eee7e47 100644 --- a/web/controllers/user_controller.go +++ b/web/controllers/user_controller.go @@ -185,6 +185,7 @@ func GetSysUserList(ctx iris.Context) { data.Userid = ctx.URLParam("userid") data.Status = ctx.URLParam("status") data.Phone = ctx.URLParam("phone") + data.Name = ctx.URLParam("name") result, count, err := data.GetPage(pageSize, pageIndex) if err != nil { diff --git a/web/models/usertab_model.go b/web/models/usertab_model.go index 75b8e6e..3c3da65 100644 --- a/web/models/usertab_model.go +++ b/web/models/usertab_model.go @@ -174,6 +174,11 @@ func (t *Usertab) GetPage(pageSize int, pageIndex int) ([]Usertab, int, error) { query = query.And("phone like ?", search) where += " and phone like " + "'%" + t.Phone + "%'" } + if !utils.ValueIsEmpty(t.Name) { + searchName := "%" + t.Name + "%" + query = query.And("name like ?", searchName) + where += " and name like " + "'%" + t.Name + "%'" + } Offset := (pageIndex - 1) * pageSize err := e.SQL("SELECT TOP " + utils.ValueToString(pageSize, "") + " usertab.* FROM usertab " + where + " AND (convert(varchar(10),pid)+convert(varchar(40),userid) NOT IN (SELECT TOP " + utils.ValueToString(Offset, "") + " convert(varchar(10),pid)+convert(varchar(40),userid) FROM usertab " + where + " ORDER BY createtime DESC)) ORDER BY createtime DESC").Find(&doc) if err != nil { @@ -251,6 +256,7 @@ func (t *Usertab) Update(id string) (update Usertab, err error) { upuser.Avatar = t.Avatar upuser.Status = t.Status upuser.Nickname = t.Nickname + upuser.Name = t.Name upuser.Lastmodify = t.Lastmodify upuser.Lastmodifytime = t.Lastmodifytime