public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 10:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

合并代码

Browse Source
This commit is contained in:
zhangwenjian
2020-04-18 10:33:29 +08:00
parent a2f4c00246
commit f5037f50a7
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/sysuser.go
+1 -3
View File
@@ -3,8 +3,6 @@ package models
import (
"errors"
orm "go-admin/database"
"go-admin/pkg"
"go-admin/pkg/utils"
"go-admin/tools"
"golang.org/x/crypto/bcrypt"
"log"
@@ -127,7 +125,7 @@ func (e *SysUser) Get() (SysUserView SysUserView, err error) {
func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, error) {
var doc []SysUserPage
table := orm.Eloquent.Select("sys_user.*,sys_dept.dept_name").Table(e.TableName())
table = table.Joins("left join sys_dept on sys_dept.dept_id = sys_user.dept_id")
if e.Username != "" {