role分页

app/system/controller/handleHistoryController.go

@@ -38,7 +38,7 @@ func (c *handleHistoryCtl) List(ctx *gin.Context) {
 		return
 	}
 
-	pages := int(math.Ceil(float64(counts) / float64(size))) //math.Ceil(float64(len(list)) / float64(size))
+	pages := int(math.Ceil(float64(counts) / float64(size)))
 	rsp := model.RsqOperationHisList{
 		Current: current,
 		Size:    size,

app/system/controller/role.go

@@ -43,17 +43,16 @@ func (c *role) List(ctx *gin.Context) {
 		size = 10
 	}
 
-	roles, err := service.RoleService.List(roleName, tenantId, roleAlias, current, size)
+	roles, counts, err := service.RoleService.List(roleName, tenantId, roleAlias, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(roles)) / float64(size))
 	rsp := model.RsqRoleList{
 		Current: current,
 		Size:    size,
-		Total:   len(roles),
-		Pages:   int(pages),
+		Total:   counts,
+		Pages:   int(math.Ceil(float64(counts) / float64(size))),
 		Records: roles,
 	}
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, rsp))

app/system/dao/operationHisDao.go

@@ -25,7 +25,7 @@ func (c *OperationHistory) Create() error {
 	return Db.Debug().Model(&c).Save(&c).Error
 }
 
-func (c OperationHistory) GetHistories(offset, limit int) ([]OperationHistory, int64, error) {
+func (c OperationHistory) GetHistories(offset, limit int) ([]OperationHistory, int, error) {
 	var list []OperationHistory
 	var counts int64
 	db := Db.Debug().Model(&c)
@@ -41,5 +41,5 @@ func (c OperationHistory) GetHistories(offset, limit int) ([]OperationHistory, i
 
 	err := db.Order("handle_time DESC").Offset(offset).Limit(limit).Find(&list).Error
 	db.Count(&counts)
-	return list, counts, err
+	return list, int(counts), err
 }

app/system/dao/role.go

@@ -23,7 +23,7 @@ func (c *Role) GetRole() error {
 	return Db.Debug().Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
 }
 
-func (c Role) GetRoles(offset, limit int) ([]Role, error) {
+func (c Role) GetRoles(offset, limit int) ([]Role, int, error) {
 	var Roles []Role
 	db := Db.Debug().Model(&c)
 	if c.RoleName != "" {
@@ -36,7 +36,9 @@ func (c Role) GetRoles(offset, limit int) ([]Role, error) {
 		db = db.Where("tenant_id like ?", "%"+c.TenantId+"%")
 	}
 	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&Roles).Error
-	return Roles, err
+	var counts int64
+	db.Count(&counts)
+	return Roles, int(counts), err
 }
 
 func (c *Role) Save() error {

app/system/model/OperationHis.go

@@ -17,5 +17,5 @@ type RsqOperationHisList struct {
 	Current int                  `json:"current"` //当前分页
 	Size    int                  `json:"size"`    //每页数量
 	Pages   int                  `json:"pages"`   //总页数
-	Total   int64                `json:"total"`   //总数
+	Total   int                  `json:"total"`   //总数
 }

app/system/service/operationHisService.go

@@ -33,7 +33,7 @@ func (s *operationHisService) Save(userId int64, tenantId int, handleType, handl
 }
 
 func (s *operationHisService) List(tenantId int, handleContent, operationType, moduleType string, current,
-	size int) ([]model.OperationHisDetail, int64, *common.Errors) {
+	size int) ([]model.OperationHisDetail, int, *common.Errors) {
 	his := dao.OperationHistory{
 		Object: handleContent,
 	}

app/system/service/roleService.go

@@ -26,7 +26,7 @@ func (s *roleService) Get(id int64) (*dao.Role, error) {
 	return role, nil
 }
 
-func (s *roleService) List(roleName, tenantId, roleAlias string, current, size int) ([]dao.Role, error) {
+func (s *roleService) List(roleName, tenantId, roleAlias string, current, size int) ([]dao.Role, int, error) {
 	role := &dao.Role{}
 	offset := (current - 1) * size
 	limit := size
@@ -40,11 +40,11 @@ func (s *roleService) List(roleName, tenantId, roleAlias string, current, size i
 		role.RoleAlias = roleAlias
 	}
 
-	roles, err := role.GetRoles(offset, limit)
+	roles, counts, err := role.GetRoles(offset, limit)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
-	return roles, nil
+	return roles, counts, nil
 }
 
 func (s *roleService) Tree() (*model.RspRoleTree, error) {