新增获取用户列表-分页

api/controller/base.go

@@ -5,4 +5,5 @@ type Api struct {
 	Basic // 基础数据
 	Role  // 角色数据
 	Menu  // 菜单数据
+	User  // 用户数据
 }

api/controller/role.go

@@ -39,29 +39,29 @@ func (r *Role) GetRoleMenuList(c *gin.Context) {
 	responses.OkWithData(roleMenuList, c)
 }
 
-// GetRolePage 搜索角色列表
+// GetRolePage 获取角色列表-分页
 func (r *Role) GetRolePage(c *gin.Context) {
-	if err := c.ShouldBind(&RoleRequest.GetRoleList); err != nil {
+	if err := c.ShouldBind(&RoleRequest.GetRolePage); err != nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
 	// 参数验证
-	if err := global.Validate.Struct(RoleRequest.GetRoleList); err != nil {
+	if err := global.Validate.Struct(RoleRequest.GetRolePage); err != nil {
 		responses.FailWithMessage(utils.Translate(err), c)
 		return
 	}
 
-	if RoleRequest.GetRoleList.Page == 0 {
-		RoleRequest.GetRoleList.Page = 1
+	if RoleRequest.GetRolePage.Page == 0 {
+		RoleRequest.GetRolePage.Page = 1
 	}
 
-	if RoleRequest.GetRoleList.PageSize == 0 {
-		RoleRequest.GetRoleList.PageSize = 20
+	if RoleRequest.GetRolePage.PageSize == 0 {
+		RoleRequest.GetRolePage.PageSize = 20
 	}
 
 	AdminRoleDao := dao.AdminRoleDao{}
-	adminRole, total, err := AdminRoleDao.GetAdminRolePageSearch(RoleRequest.GetRoleList.RoleName, RoleRequest.GetRoleList.Page, RoleRequest.GetRoleList.PageSize)
+	adminRole, total, err := AdminRoleDao.GetAdminRolePageSearch(RoleRequest.GetRolePage.RoleName, RoleRequest.GetRolePage.Page, RoleRequest.GetRolePage.PageSize)
 
 	if err != nil {
 		responses.FailWithMessage(err.Error(), c)
@@ -70,8 +70,8 @@ func (r *Role) GetRolePage(c *gin.Context) {
 	}
 
 	result := make(map[string]interface{})
-	result["page"] = RoleRequest.GetRoleList.Page
-	result["page_size"] = RoleRequest.GetRoleList.PageSize
+	result["page"] = RoleRequest.GetRolePage.Page
+	result["page_size"] = RoleRequest.GetRolePage.PageSize
 	result["total"] = total
 	result["data"] = adminRole
 	responses.OkWithData(result, c)

api/controller/user.go

@@ -0,0 +1,52 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"hospital-admin-api/api/dao"
+	"hospital-admin-api/api/requests"
+	"hospital-admin-api/api/responses"
+	"hospital-admin-api/global"
+	"hospital-admin-api/utils"
+)
+
+type User struct{}
+
+var UserRequest requests.UserRequest
+
+// GetUserPage 获取用户列表-分页
+func (r *User) GetUserPage(c *gin.Context) {
+	if err := c.ShouldBind(&UserRequest.GetUserPage); err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 参数验证
+	if err := global.Validate.Struct(UserRequest.GetUserPage); err != nil {
+		responses.FailWithMessage(utils.Translate(err), c)
+		return
+	}
+
+	if UserRequest.GetUserPage.Page == 0 {
+		UserRequest.GetUserPage.Page = 1
+	}
+
+	if UserRequest.GetUserPage.PageSize == 0 {
+		UserRequest.GetUserPage.PageSize = 20
+	}
+
+	AdminUserDao := dao.AdminUserDao{}
+	adminUser, total, err := AdminUserDao.GetAdminUserPageSearch(UserRequest.GetUserPage, UserRequest.GetUserPage.Page, UserRequest.GetUserPage.PageSize)
+
+	if err != nil {
+		responses.FailWithMessage(err.Error(), c)
+		c.Abort()
+		return
+	}
+
+	result := make(map[string]interface{})
+	result["page"] = UserRequest.GetUserPage.Page
+	result["page_size"] = UserRequest.GetUserPage.PageSize
+	result["total"] = total
+	result["data"] = adminUser
+	responses.OkWithData(result, c)
+}