正在显示
1 个修改的文件
包含
7 行增加
和
5 行删除
| @@ -11,9 +11,11 @@ type baseController struct { | @@ -11,9 +11,11 @@ type baseController struct { | ||
| 11 | 11 | ||
| 12 | func (controller *baseController) returnPageListData(count int64, data interface{}, err error, pageNumber int) { | 12 | func (controller *baseController) returnPageListData(count int64, data interface{}, err error, pageNumber int) { |
| 13 | dataMap := map[string]interface{}{ | 13 | dataMap := map[string]interface{}{ |
| 14 | - "totalRow": count, | ||
| 15 | - "pageNumber": pageNumber, | 14 | + "grid": map[string]interface{}{ |
| 15 | + "total": count, | ||
| 16 | + //"pageNumber": pageNumber, | ||
| 16 | "list": data, | 17 | "list": data, |
| 18 | + }, | ||
| 17 | } | 19 | } |
| 18 | controller.Response(dataMap, err) | 20 | controller.Response(dataMap, err) |
| 19 | } | 21 | } |
| @@ -36,9 +38,9 @@ func (controller *baseController) GetOrgId() int64 { | @@ -36,9 +38,9 @@ func (controller *baseController) GetOrgId() int64 { | ||
| 36 | 38 | ||
| 37 | func (controller *baseController) GetOperator() domain.Operator { | 39 | func (controller *baseController) GetOperator() domain.Operator { |
| 38 | return domain.Operator{ | 40 | return domain.Operator{ |
| 39 | - UserId: 1, | ||
| 40 | - CompanyId: 1, | ||
| 41 | - OrgId: 1, | 41 | + UserId: 9, |
| 42 | + CompanyId: 23, | ||
| 43 | + OrgId: 45, | ||
| 42 | UserBaseId: 1, | 44 | UserBaseId: 1, |
| 43 | } | 45 | } |
| 44 | } | 46 | } |
-
请 注册 或 登录 后发表评论