正在显示
3 个修改的文件
包含
25 行增加
和
11 行删除
@@ -424,22 +424,25 @@ func (usersService *UsersService) SelectorCompanyRole(selectorQuery *query.Compa | @@ -424,22 +424,25 @@ func (usersService *UsersService) SelectorCompanyRole(selectorQuery *query.Compa | ||
424 | selectorQuery.Operator.OrgId, | 424 | selectorQuery.Operator.OrgId, |
425 | selectorQuery.Operator.UserId) | 425 | selectorQuery.Operator.UserId) |
426 | result, err := creationUserGateway.RoleSearch(allied_creation_user.ReqRoleSearch{ | 426 | result, err := creationUserGateway.RoleSearch(allied_creation_user.ReqRoleSearch{ |
427 | - Limit: selectorQuery.PageSize, | ||
428 | - Offset: (selectorQuery.PageNumber - 1) * selectorQuery.PageSize, | 427 | + Limit: selectorQuery.PageSize, |
428 | + Offset: (selectorQuery.PageNumber - 1) * selectorQuery.PageSize, | ||
429 | + RoleName: selectorQuery.RoleName, | ||
429 | }) | 430 | }) |
430 | if err != nil { | 431 | if err != nil { |
431 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) | 432 | return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) |
432 | } | 433 | } |
433 | var ( | 434 | var ( |
434 | - dataList []dto.UserOrg | ||
435 | - // item dto.UserOrg | 435 | + dataList []dto.UserRole |
436 | + item dto.UserRole | ||
436 | ) | 437 | ) |
437 | - // for _, v := range result.Orgs { | ||
438 | - // item = dto.UserOrg{ | ||
439 | - // OrgID: strconv.Itoa(v.OrgID), | ||
440 | - // OrgName: v.OrgName, | ||
441 | - // } | ||
442 | - // dataList = append(dataList, item) | ||
443 | - // } | 438 | + for _, v := range result.Roles { |
439 | + item = dto.UserRole{ | ||
440 | + RoleID: strconv.Itoa(v.RoleID), | ||
441 | + RoleName: v.RoleName, | ||
442 | + OrgName: v.Ext.OrgName, | ||
443 | + Descript: v.Desc, | ||
444 | + } | ||
445 | + dataList = append(dataList, item) | ||
446 | + } | ||
444 | return int64(result.Count), dataList, nil | 447 | return int64(result.Count), dataList, nil |
445 | } | 448 | } |
@@ -129,3 +129,13 @@ func (controller *UsersController) SelectorCompanyOrg() { | @@ -129,3 +129,13 @@ func (controller *UsersController) SelectorCompanyOrg() { | ||
129 | cnt, data, err := usersService.SelectorCompanyOrg(selectorQuery) | 129 | cnt, data, err := usersService.SelectorCompanyOrg(selectorQuery) |
130 | controller.returnPageListData(cnt, data, err, selectorQuery.PageNumber) | 130 | controller.returnPageListData(cnt, data, err, selectorQuery.PageNumber) |
131 | } | 131 | } |
132 | + | ||
133 | +//SelectorCompanyRole 角色选择表 | ||
134 | +func (controller *UsersController) SelectorCompanyRole() { | ||
135 | + usersService := service.NewUsersService(nil) | ||
136 | + selectorQuery := &query.CompanyRoleSelectorQuery{} | ||
137 | + controller.Unmarshal(selectorQuery) | ||
138 | + selectorQuery.Operator = controller.GetOperator() | ||
139 | + cnt, data, err := usersService.SelectorCompanyRole(selectorQuery) | ||
140 | + controller.returnPageListData(cnt, data, err, selectorQuery.PageNumber) | ||
141 | +} |
@@ -19,5 +19,6 @@ func init() { | @@ -19,5 +19,6 @@ func init() { | ||
19 | web.Router("/v1/web/users/cooperation-user/enable", &web_client.UsersController{}, "Put:CooperationUserEnable") | 19 | web.Router("/v1/web/users/cooperation-user/enable", &web_client.UsersController{}, "Put:CooperationUserEnable") |
20 | web.Router("/v1/web/users/cooperation-user/reset-password", &web_client.UsersController{}, "Put:CooperationUserResetPassword") | 20 | web.Router("/v1/web/users/cooperation-user/reset-password", &web_client.UsersController{}, "Put:CooperationUserResetPassword") |
21 | web.Router("/v1/web/users/selector/org", &web_client.UsersController{}, "Post:SelectorCompanyOrg") | 21 | web.Router("/v1/web/users/selector/org", &web_client.UsersController{}, "Post:SelectorCompanyOrg") |
22 | + web.Router("/v1/web/users/selector/role", &web_client.UsersController{}, "Post:SelectorCompanyRole") | ||
22 | 23 | ||
23 | } | 24 | } |
-
请 注册 或 登录 后发表评论