Beta:发布v2.7.5测试版本 (#1896)
* 生产环境时移除console * 更新第三方库道最新版本,修正导致的兼容问题 * feat: 版本号变更,修复自动化历史的结构体描述 * feat: 放弃element的按需引用,增加自定义表单组件,替换原始的iframe引入模式。 * feat: 放开表单生成器的key输入 * feat: 自动化代码关联属性支持跨数据库关联 * fixed: 修复跨库关联模板 * feat: 允许清空跨数据关联的业务库选项 * feat: 增加用户搜索功能 * feat: 允许单条API同步 --------- Co-authored-by: task <121913992@qq.com> Co-authored-by: task <ms.yangdan@gmail.com>
This commit is contained in:
@@ -4,10 +4,10 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/flipped-aurora/gin-vue-admin/server/model/common"
|
||||
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
|
||||
"time"
|
||||
|
||||
"github.com/flipped-aurora/gin-vue-admin/server/global"
|
||||
"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
|
||||
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
|
||||
"github.com/flipped-aurora/gin-vue-admin/server/utils"
|
||||
"github.com/gofrs/uuid/v5"
|
||||
@@ -85,11 +85,25 @@ func (userService *UserService) ChangePassword(u *system.SysUser, newPassword st
|
||||
//@param: info request.PageInfo
|
||||
//@return: err error, list interface{}, total int64
|
||||
|
||||
func (userService *UserService) GetUserInfoList(info request.PageInfo) (list interface{}, total int64, err error) {
|
||||
func (userService *UserService) GetUserInfoList(info systemReq.GetUserList) (list interface{}, total int64, err error) {
|
||||
limit := info.PageSize
|
||||
offset := info.PageSize * (info.Page - 1)
|
||||
db := global.GVA_DB.Model(&system.SysUser{})
|
||||
var userList []system.SysUser
|
||||
|
||||
if info.NickName != "" {
|
||||
db = db.Where("nick_name LIKE ?", "%"+info.NickName+"%")
|
||||
}
|
||||
if info.Phone != "" {
|
||||
db = db.Where("phone LIKE ?", "%"+info.Phone+"%")
|
||||
}
|
||||
if info.Username != "" {
|
||||
db = db.Where("username LIKE ?", "%"+info.Username+"%")
|
||||
}
|
||||
if info.Email != "" {
|
||||
db = db.Where("email LIKE ?", "%"+info.Email+"%")
|
||||
}
|
||||
|
||||
err = db.Count(&total).Error
|
||||
if err != nil {
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user