合并代码
This commit is contained in:
1 parent
a2f4c00246
commit
f5037f50a7
3 files changed
+8
-12
No files matched your search
+1
-3
@@ -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 != "" {
|
||||
|
||||
Reference in new issue
Block a user